Changeset 54ee51d4


Ignore:
Timestamp:
05/02/2021 08:22:08 AM (6 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, ml-11.0, multilib, trunk, xry111/glibc-2.34, xry111/tester-nohack, xry111/usr-move
Children:
811f42a, bfee8ec, c91649c
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:
1 edited

Legend:

Unmodified
Added
Removed
  • git-version.sh

    r6ca780c r54ee51d4  
    3131
    3232sha="$(git describe --abbrev=1)"
    33 if git describe --all --match trunk > /dev/null 2> /dev/null; then
     33if [ "$(git branch --show-current)" = "trunk" ]; then
    3434        sha=$(echo "$sha" | sed 's/-g[^-]*$//')
    3535fi
Note: See TracChangeset for help on using the changeset viewer.