Changeset 803a28b2

Timestamp:

05/01/2021 10:10:38 PM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

bfee8ec

Parents:

88bdbb7 (diff), 6ca780c (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) (2 diffs)

git-version.sh

@@ -15 +15 @@
 
 commit_date=$(git show -s --format=format:"%cd" --date=local)
-short_date=$(date --date "$commit_date" "+%Y%m%d")
 
 year=$(date --date "$commit_date" "+%Y")
@@ -31 +30 @@
 full_date="$month $day$suffix, $year"
 
-sha="g$(git describe --always)"
-version="GIT-$short_date-$sha"
-versiond="GIT-$short_date-$sha-systemd"
+sha="$(git describe --abbrev=1)"
+if git describe --all --match trunk > /dev/null 2> /dev/null; then
+        sha=$(echo "$sha" | sed 's/-g[^-]*$//')
+fi
+version="$sha"
+versiond="$sha-systemd"
 
 if [ "$(git diff HEAD | wc -l)" != "0" ]; then
-        version="$version-MODIFIED"
-        versiond="$versiond-MODIFIED"
+        version="$version+"
+        versiond="$versiond+"
 fi