Merge branch 'maint-1.5.1' into maint

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 57f7f7777602eadc79b6bb04e6652d81d14d770c..f24c7f2d23c13e9874308a019f3c0f93225de3c0 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -29,15 +29,27 @@ 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 ;;
        esac
 }
 
+cd_to_toplevel () {
+       cdup=$(git-rev-parse --show-cdup)
+       if test ! -z "$cdup"
+       then
+               cd "$cdup" || {
+                       echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree"
+                       exit 1
+               }
+       fi
+}
+
 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."
 }