From 9f989a5abf3c9f13e1a0ab9d01f71586e3035f0e Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 13 Jan 2021 11:11:33 +0100
Subject: [PATCH] Another problem. New fix try: do not consider branch names as
 version numbers

---
 App/tools/getVersion.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/App/tools/getVersion.pl b/App/tools/getVersion.pl
index 2c6b9e7..49c6fd1 100755
--- a/App/tools/getVersion.pl
+++ b/App/tools/getVersion.pl
@@ -216,6 +216,8 @@ sub parse_git_output {
             say STDERR "no tag on this version => version test";
             $version = "test";
         }
+        elsif ($line =~ /On branch/) {
+        }
         elsif ($line =~ /^([0-9]+)\.([0-9]+)(\.([0-9]+))?$/) {
             my $major = $1;
             my $minor = $2;
@@ -223,7 +225,7 @@ sub parse_git_output {
             $version = "$major.$minor.$patch";
             say STDERR "checking tag $line => version $version";
         }
-        elsif ($line =~ /^[a-zA-Z]+[a-zA-Z0-9]*_([0-9]+)_([0-9]+)(_([0-9]+))?$/) {
+        elsif ($line =~ /[a-zA-Z]+[a-zA-Z0-9]*_([0-9]+)_([0-9]+)(_([0-9]+))?$/) {
             my $major = $1;
             my $minor = $2;
             my $patch = $4 || "0";