Merge branch 'tr/maint-cherry-pick-list'

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
old mode 100755 (executable)
new mode 100644 (file)
index d56426d..5e22440
--- 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."
 }