Changeset bfee8ec


Ignore:
Timestamp:
05/06/2021 03:45:09 AM (6 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib
Children:
0e9fb93
Parents:
803a28b2 (diff), 54ee51d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Automatic merge of trunk into multilib

File:
1 edited

Legend:

Unmodified
Added
Removed
  • git-version.sh

    r803a28b2 rbfee8ec  
    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.