fix bug in branch parsing when being ahead of remote branch

2023-08-08 14:55:01 +02:00
parent c1a1d12645
commit 08d12526b1
1 changed files with 6 additions and 1 deletions
@@ -267,7 +267,7 @@ sub parse_git_output {
        elsif ($line =~/([0-9a-fA-F]+)[ \t]+refs\/tags\//) {
            $remotetagcommit = $1
        }
-        elsif ($line =~/\* [^ ]+ +([0-9a-fA-F]+) \[(.*)\/(.*)\]/) {
+        elsif ($line =~/\* [^ ]+ +([0-9a-fA-F]+) \[(.*)\/([^:]*).*\]/) {
            $commit = $1;
            $remote = $2;
            $branch = $3;
@@ -324,6 +324,11 @@ eval {
        } else {
            say STDERR "commit undefined";
        }
+        if (defined($branch)) {
+            say STDERR "branch = $branch";
+        } else {
+            say STDERR "branch undefined";
+        }
    }
    if (defined($remote) && defined($tag) && defined($commit)) {
        my $err = eval {