From 4d12d32d92fbfbf74b79f36c0d17cc07db2c7aa4 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 12 Jul 2023 11:26:26 +0200
Subject: [PATCH] improve error handling when checking remote tag

---
 App/tools/getVersion.pl | 56 ++++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/App/tools/getVersion.pl b/App/tools/getVersion.pl
index 302e60a..fbbaecf 100755
--- a/App/tools/getVersion.pl
+++ b/App/tools/getVersion.pl
@@ -19,6 +19,7 @@ my $version;
 my $tag;
 my $remote;
 my $branch;
+my $commit;
 my $remotetagcommit;
 my $debug = 0;
 
@@ -70,7 +71,7 @@ sub check_output {
                 if ($fh == $child_stdout) {
                     $output .= $line;
                 }
-                elsif ($fh == $child_stdout) {
+                else {
                     $error .= $line;
                 }
             }
@@ -266,6 +267,14 @@ sub parse_git_output {
         elsif ($line =~/([0-9a-fA-F]+)[ \t]+refs\/tags\//) {
             $remotetagcommit = $1
         }
+        elsif ($line =~/\* [^ ]+ ([0-9a-fA-F]+) \[(.*)\/(.*)\]/) {
+            $commit = $1;
+            $remote = $2;
+            $branch = $3;
+            if ($debug) {
+                say STDERR 'Commit $commit on branch $branch on remote "$remote"';
+            }
+        }
     }
 }
 
@@ -282,34 +291,47 @@ eval {
         exit;
     }
 
-    @statusinfo = check_output("git describe --tags HEAD");
+    @statusinfo = check_output("git describe --tags");
     parse_git_output(\@statusinfo);
     if (!defined($version)) {
         say STDERR "Could not find out version tag => version test";
         $version = "test";
     }
 
+    if ($version ne "test") {
+        @statusinfo = check_output("git branch -vv");
+        parse_git_output(\@statusinfo);
+    }
+
     if ($version ne "test") {
         @statusinfo = check_output("git status");
         parse_git_output(\@statusinfo);
     }
 
-    if (defined($remote) && defined($tag)) {
-        @statusinfo = check_output("git ls-remote --tags $remote $tag");
-        parse_git_output(\@statusinfo);
-
-        if (!$remotetagcommit) {
-            say STDERR "Could not find tag $tag on remote \"$remote\" => version test";
-            say STDERR "Try: git push --tags $remote $branch";
-            $version = "test";
-        } else {
-            @statusinfo = check_output("git rev-parse $tag");
-            my $localtagcommit = $statusinfo[0];
-            if ($localtagcommit ne $remotetagcommit) {
-                say STDERR "Tag $tag is different from the same tag on remote \"$remote\" => version test";
-                say STDERR "Try a new tag after fixing $tag: git tag --force $tag $remotetagcommit";
-                say STDERR "or overwrite \"$remote\": git push --force --tags $remote $branch";
+    if (defined($remote) && defined($tag) && defined($commit)) {
+        my $err = eval {
+            @statusinfo = check_output("git ls-remote --tags $remote $tag");
+            parse_git_output(\@statusinfo);
+            if (!$remotetagcommit) {
+                say STDERR "Tag $tag not yet pushed to remote \"$remote\" => version test";
+                say STDERR "Try: git push --tags $remote $branch";
+                $version = "test";
+            } else {
+                $remotetagcommit = substr($remotetagcommit,0,length($commit));
+                if ($remotetagcommit ne $commit) {
+                    say STDERR "Tag $tag differs from the same tag on remote \"$remote\" => version test";
+                    say STDERR "It is commit $commit locally but commit $remotetagcommit on $remote.";
+                    say STDERR "Try a new tag after fixing your $tag tag: git tag --force $tag $remotetagcommit";
+                    say STDERR "Or overwrite \"$remote\": git push --force --tags $remote $branch";
+                    $version = "test";
+                }
             }
+        };
+        if ($@) {
+            $@ =~ s/\n/\n| /g;
+            say STDERR "Cannot check tag $tag on remote \"$remote\":";
+            say STDERR "| $@";
+            say STDERR "I hope you know what you're doing.";
         }
     }