From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jul 2013 05:51:41 +0000 (-0700)
Subject: Merge branch 'dk/version-gen-gitdir' into maint
X-Git-Tag: v1.8.3.4~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/25b3e4fffd88258c6150bf9b088506f438ccb100?ds=inline;hp=-c

Merge branch 'dk/version-gen-gitdir' into maint

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

25b3e4fffd88258c6150bf9b088506f438ccb100
diff --combined GIT-VERSION-GEN
index 8ddaa16ac1,91ec831b0e..b8b8457735
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
 -DEF_VER=v1.8.1.6
 +DEF_VER=v1.8.3.3
  
  LF='
  '
@@@ -11,7 -11,7 +11,7 @@@
  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) ;;