[PATCH 12/34] git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Nov 30, 2014, 08:24 UTC
Message-ID: <1417335899-27307-13-git-send-email-pclouds@gmail.com>
In-Reply-To: <1417335899-27307-1-git-send-email-pclouds@gmail.com>

If $GIT_COMMON_DIR is set, $GIT_OBJECT_DIRECTORY should be $GIT_COMMON_DIR/objects, not $GIT_DIR/objects. Just let rev-parse --git-path handle it.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 git-sh-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index d968760..94a5c6d 100644
--- 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"

-- 
2.1.0.rc0.78.gc0d8480