[PATCH v4 11/27] 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
- Mar 1, 2014, 12:12 UTC
- Message-ID
- <1393675983-3232-12-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1393675983-3232-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 fffa3c7..475ca43 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -343,7 +343,7 @@ then 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)"} fi peel_committish () {
-- 1.9.0.40.gaa8c3ea