Fifth batch for 2.6

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index c42c6e6365090e22ec7892baa51b919f2898e956..4691fbcb64fe7ecbc58930bb96d4e6b28e2b87a7 100644 (file)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -344,7 +344,7 @@ git_dir_init () {
                echo >&2 "Unable to determine absolute path of git directory"
                exit 1
        }
-       : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
+       : ${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}
 }
 
 if test -z "$NONGIT_OK"