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:
Alex Henrie 2025-08-02 05:03:17 +00:00
commit 831a310c6c

View file

@ -43,7 +43,7 @@ pkgver() {
printf "r%s" "$(bzr revno)" printf "r%s" "$(bzr revno)"
# Git, tags available # 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 # Git, no tags available
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"