X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-sh-setup.sh;h=f24c7f2d23c13e9874308a019f3c0f93225de3c0;hb=cfabd6eee1745cfec58cfcb794ce8847e43b888a;hp=6b1c1423ebb7fde53aae566fa09211d331c422bc;hpb=f4b6c6b90fdce12d69e4ad80ff6082405ec8cfb8;p=git.git

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 6b1c1423e..f24c7f2d2 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -29,7 +29,7 @@ set_reflog_action() {
 }
 
 is_bare_repository () {
-	git-repo-config --bool --get core.bare ||
+	git-config --bool --get core.bare ||
 	case "$GIT_DIR" in
 	.git | */.git) echo false ;;
 	*) echo true ;;
@@ -48,7 +48,8 @@ cd_to_toplevel () {
 }
 
 require_work_tree () {
-	test $(is_bare_repository) = false ||
+	test $(is_bare_repository) = false &&
+	test $(git-rev-parse --is-inside-git-dir) = false ||
 	die "fatal: $0 cannot be used without a working tree."
 }