diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-09-04 15:41:09 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-09-04 18:01:35 +0000 |
| commit | 544ce0d6b711a08896c65e32239c1cb75d350850 (patch) | |
| tree | 0f6bca47c12ab0c11720220d3cab2c70d4c99fa7 /git-version-gen | |
| parent | b148d055423d5582217035498cded314aee77e14 (diff) | |
update git-version-gen to generate proper version numbers
We don't want the version of the last tagged version, but the version
number uniquely representing the current HEAD. Use the script from
libosmocore.
I suspect that this somehow got broken in commit 00d5114717040fedd443e3f723385ede434c8b39
Related: OS#3517
Change-Id: Iba3212aa417dce4240c5c27eb4f12afcd9c95e5b
Diffstat (limited to 'git-version-gen')
| -rwxr-xr-x | git-version-gen | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-version-gen b/git-version-gen index 51d4bf7..42cf3d2 100755 --- a/git-version-gen +++ b/git-version-gen @@ -93,7 +93,8 @@ if test -n "$v" then : # use $v elif - v=`git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1 2>/dev/null` \ + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ && case $v in [0-9]*) ;; v[0-9]*) ;; |