Merge branch 'maint'
* maint: GIT-VERSION-GEN: restrict tags used
This commit is contained in:
commit
0e4607c09d
@ -12,7 +12,7 @@ if test -f version
|
|||||||
then
|
then
|
||||||
VN=$(cat version) || VN="$DEF_VER"
|
VN=$(cat version) || VN="$DEF_VER"
|
||||||
elif test -d .git -o -f .git &&
|
elif test -d .git -o -f .git &&
|
||||||
VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
|
VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
|
||||||
case "$VN" in
|
case "$VN" in
|
||||||
*$LF*) (exit 1) ;;
|
*$LF*) (exit 1) ;;
|
||||||
v[0-9]*)
|
v[0-9]*)
|
||||||
|
Loading…
Reference in New Issue
Block a user