mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'dk/version-gen-gitdir' into maint
* dk/version-gen-gitdir: GIT-VERSION-GEN: support non-standard $GIT_DIR path
This commit is contained in:
commit
25b3e4fffd
|
@ -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) ;;
|
||||
|
|
Loading…
Reference in a new issue