summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNick Brown <nickbroon@gmail.com>2021-09-27 12:11:23 +0100
committerDamjan Marion <dmarion@me.com>2021-09-27 14:34:46 +0000
commit0faf38876138555aefaa89609c2e1fd409acafa5 (patch)
treeb8fc7c5eef5ef3bb5ed3dd231ada32a4618269e7 /src
parentb8165b96f5440fcdcedc01de72444617d6957207 (diff)
build: Stricter git tag version parsing
Only consider git tags that begin with 'v', as these are far more likely to be vpp version tags, and thus parsed by the version script properly. This needed when working with git clone to which additional tags may have been added. eg tags like: upstream/21.06_rc0+20210622 debian/21.06+20210811-1myvendor2 should be ingored, as they will not be parsed correctly. Type: make Change-Id: I7a6d185acd029335abaea5a9dac48839f1397135 Signed-off-by: Nick Brown <nickbroon@gmail.com>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/scripts/version2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scripts/version b/src/scripts/version
index 455ab760352..f9f3d215641 100755
--- a/src/scripts/version
+++ b/src/scripts/version
@@ -20,7 +20,7 @@ cd "$path"
if [ -f .version ]; then
vstring=$(cat .version)
else
- vstring=$(git describe --long)
+ vstring=$(git describe --long --match "v*")
if [ $? != 0 ]; then
exit 1
fi