From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Jun 2013 20:48:48 +0000 (-0700)
Subject: Merge branch 'dk/version-gen-gitdir'
X-Git-Tag: v1.8.4-rc0~135
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9f19e0c31043f15ad51c08a8660a3b6fb32646a1?hp=9a3f5986f7da15d490e8aa3977dd7384f1eef9dd

Merge branch 'dk/version-gen-gitdir'

Allow packaging a tarball in a working tree with $GIT_DIR set elsewhere.

* dk/version-gen-gitdir:
GIT-VERSION-GEN: support non-standard $GIT_DIR path
---

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 390782fa12..b4d4e5045f 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -11,7 +11,7 @@ LF='
 if test -f version
 then
 	VN=$(cat version) || VN="$DEF_VER"
-elif test -d .git -o -f .git &&
+elif test -d ${GIT_DIR:-.git} -o -f .git &&
 	VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) &&
 	case "$VN" in
 	*$LF*) (exit 1) ;;