Changeset 54ee51d4

Timestamp:

05/02/2021 08:22:08 AM (3 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

bfee8ec, c91649c2

Parents:

6ca780c

git-author:

Xi Ruoyao <xry111@…> (05/02/2021 08:21:50 AM)

git-committer:

Xi Ruoyao <xry111@…> (05/02/2021 08:22:08 AM)

Message:

git-version: fix trunk branch detection

File:

• git-version.sh (modified) (1 diff)

git-version.sh

@@ -31 +31 @@
 
 sha="$(git describe --abbrev=1)"
-if git describe --all --match trunk > /dev/null 2> /dev/null; then
+if [ "$(git branch --show-current)" = "trunk" ]; then
         sha=$(echo "$sha" | sed 's/-g[^-]*$//')
 fi