Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6

* gf/maint-sh-setup-nongit-ok:
require_work_tree broken with NONGIT_OK

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index dfcb8078f508d6cc26d312d61b64e0185e90b74b..dcf9d0a31030ce4b6a7e7f2268ed8d25fdb57322 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -137,7 +137,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."
 }