diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:07 -0800 |
| commit | 8acd141bb5cd4155d849fbfb3b74eb509608cd15 (patch) | |
| tree | 6fb12a4c194e1ba58e1b94a34e29f71fd80eb946 /git-sh-setup.sh | |
| parent | 490b8ad76fec278be532b893d2b5b6df9a621bec (diff) | |
| parent | ab62677b1424d4e53cf222c973b841d3dada4cf3 (diff) | |
| download | git-8acd141bb5cd4155d849fbfb3b74eb509608cd15.tar.gz git-8acd141bb5cd4155d849fbfb3b74eb509608cd15.tar.xz | |
Merge branch 'gf/maint-sh-setup-nongit-ok'
* gf/maint-sh-setup-nongit-ok:
require_work_tree broken with NONGIT_OK
Diffstat (limited to 'git-sh-setup.sh')
| -rw-r--r-- | git-sh-setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index d56426dd3..5e22440ae 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -128,7 +128,7 @@ cd_to_toplevel () { } require_work_tree () { - test $(git rev-parse --is-inside-work-tree) = true || + test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true || die "fatal: $0 cannot be used without a working tree." } |