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

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

diff --combined GIT-VERSION-GEN
index 8ddaa16ac1ee8936cde50a75e30905c62d0709d7,91ec831b0e5e5923bbc43b4900ed3f283ce67ff1..b8b8457735669f2acc6adcf9271c482ef713ad0f
--- 1/GIT-VERSION-GEN
--- 2/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) ;;