Changeset 803a28b2


Ignore:
Timestamp:
05/01/2021 10:10:38 PM (6 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • git-version.sh

    r88bdbb7 r803a28b2  
    1515
    1616commit_date=$(git show -s --format=format:"%cd" --date=local)
    17 short_date=$(date --date "$commit_date" "+%Y%m%d")
    1817
    1918year=$(date --date "$commit_date" "+%Y")
     
    3130full_date="$month $day$suffix, $year"
    3231
    33 sha="g$(git describe --always)"
    34 version="GIT-$short_date-$sha"
    35 versiond="GIT-$short_date-$sha-systemd"
     32sha="$(git describe --abbrev=1)"
     33if git describe --all --match trunk > /dev/null 2> /dev/null; then
     34        sha=$(echo "$sha" | sed 's/-g[^-]*$//')
     35fi
     36version="$sha"
     37versiond="$sha-systemd"
    3638
    3739if [ "$(git diff HEAD | wc -l)" != "0" ]; then
    38         version="$version-MODIFIED"
    39         versiond="$versiond-MODIFIED"
     40        version="$version+"
     41        versiond="$versiond+"
    4042fi
    4143
Note: See TracChangeset for help on using the changeset viewer.