Merge branch 'rs/diff'

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 9ac657a70e67315f46a0c42611d7e6d78f538031..0de49e8459a0d00264de442e6e89db846496541d 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -44,7 +44,7 @@ cd_to_toplevel () {
 }
 
 require_work_tree () {
-       test $(is_bare_repository) = false &&
+       test $(git-rev-parse --is-inside-work-tree) = true &&
        test $(git-rev-parse --is-inside-git-dir) = false ||
        die "fatal: $0 cannot be used without a working tree."
 }