Changeset 7af57d2e

Timestamp:

10/13/2021 11:30:53 AM (3 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

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, 12.2, 12.2-rc1, arm, bdubbs/gcc13, 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/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

64ce287

Parents:

3d7b4f6

Message:

git-version: remove -g{sha} unconditionally

File:

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

git-version.sh

@@ -49 +49 @@
 
 sha="$(git describe --abbrev=1)"
-if [ "$(git branch --show-current)" = "trunk" ]; then
-        sha=$(echo "$sha" | sed 's/-g[^-]*$//')
-fi
-version="$sha"
-versiond="$sha-systemd"
+rev=$(echo "$sha" | sed 's/-g[^-]*$//')
+version="$rev"
+versiond="$rev-systemd"
 
 if [ "$(git diff HEAD | wc -l)" != "0" ]; then