git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

pclouds · gitster · commit 3bc518084acf · 2014-12-01T11:00:13.000-08:00
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 &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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"

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ git_dir_init () {`
`344`	`344`	`echo >&2 "Unable to determine absolute path of git directory"`
`345`	`345`	`exit 1`
`346`	`346`	`}`
`347`		`- : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}`
	`347`	`+ : ${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`if test -z "$NONGIT_OK"`