Merge branch 'git-versions' into 'master'
proto: Consider lightweight Git tags when determining the version number and strip initial "v" from Git tag names See merge request pacman/pacman!110
This commit is contained in:
commit
831a310c6c
1 changed files with 1 additions and 1 deletions
|
@ -43,7 +43,7 @@ pkgver() {
|
|||
printf "r%s" "$(bzr revno)"
|
||||
|
||||
# Git, tags available
|
||||
printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
|
||||
printf "%s" "$(git describe --tags --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g;s/^v//')"
|
||||
|
||||
# Git, no tags available
|
||||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||
|
|
Loading…
Add table
Reference in a new issue