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

1 files changed, 1 insertions, 1 deletions

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index dfcb8078f..dcf9d0a31 100755
--- 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."
 }