[MERGED] libosmo-abis[master]: git-version-gen: Check first for new tag format

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed May 2 21:20:40 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: git-version-gen: Check first for new tag format
......................................................................


git-version-gen: Check first for new tag format

Tags starting with "v*" are old ones. We first want to check for the new
ones, otherwise the wrong tag is selected as the last one.

Change-Id: Ic39bed2fcf7e3ccb6a83e2999d29d129e07c1a84
---
M git-version-gen
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/git-version-gen b/git-version-gen
index 42cf3d2..2a9abb5 100755
--- a/git-version-gen
+++ b/git-version-gen
@@ -93,8 +93,8 @@
 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 describe --abbrev=4 HEAD 2>/dev/null \
+	  || git describe --abbrev=4 --match='v*' HEAD 2>/dev/null` \
     && case $v in
 	 [0-9]*) ;;
 	 v[0-9]*) ;;

-- 
To view, visit https://gerrit.osmocom.org/7981
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic39bed2fcf7e3ccb6a83e2999d29d129e07c1a84
Gerrit-PatchSet: 1
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list