Teach 'git apply' to look at $GIT_DIR/config

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 6b1c1423ebb7fde53aae566fa09211d331c422bc..f24c7f2d23c13e9874308a019f3c0f93225de3c0 100755 (executable)
--- 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."
 }