Changeset bfee8ec

Timestamp:

05/06/2021 03:45:09 AM (3 years 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:

• 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