diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-05-02 20:10:14 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-05-02 21:29:05 +0000 |
commit | 00d5114717040fedd443e3f723385ede434c8b39 (patch) | |
tree | 93532a8507757c7108909e805ac6035b5d7f4864 /git-version-gen | |
parent | 3a496f3b8a8a902467f0915f671a07be472e17fc (diff) |
git-version-gen: Take into account tags not in master
Latest tag 0.3.0 was created in a release branch instead of master. As a
result, git describe doesn't show them. Let's instead reuse git command used in
osmo-ci to get latest tag from tag list when OBS latest repository is
built.
Change-Id: I3e461d4270b5e6d4c42126df4deef5651dca1e27
Diffstat (limited to 'git-version-gen')
-rwxr-xr-x | git-version-gen | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-version-gen b/git-version-gen index 42cf3d2..51d4bf7 100755 --- a/git-version-gen +++ b/git-version-gen @@ -93,8 +93,7 @@ if test -n "$v" then : # use $v elif - v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ - || git describe --abbrev=4 HEAD 2>/dev/null` \ + v=`git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1 2>/dev/null` \ && case $v in [0-9]*) ;; v[0-9]*) ;; |