.mailmap: combine more (email, name) to individual persons

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index eeecb5d9fcd43298e4c5ab7c7d6c0015b70a86c4..b4d4e5045fc78173c77de6de3fb9330de49a9628 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.3.1
+DEF_VER=v1.8.3.GIT
 
 LF='
 '
@@ -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) ;;