Fix Repo.revision when using tag

Repo.revision() was returning self.tag instead of the corresponding commit This patch fixes this by calling Repo.resolve_tag_cmd(). Signed-off-by: Félix Piédallu <[email protected]> Signed-off-by: Jan Kiszka <[email protected]>
siemens · Dec 11, 2023 · 1e19842 · 1e19842
1 parent 3ecb52c
commit 1e19842
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/kas/repos.py b/kas/repos.py
@@ -120,15 +120,19 @@ def revision(self):
         if self.commit:
             return self.commit
         if self.tag:
+            (_, output) = run_cmd(self.resolve_tag_cmd(),
+                                  cwd=self.path, fail=False)
+            if output:
+                return output.strip()
             return self.tag
         branch = self.branch or self.refspec
-        if not branch:
-            return None
-        (_, output) = run_cmd(self.resolve_branch_cmd(),
-                              cwd=self.path, fail=False)
-        if output:
-            return output.strip()
-        return branch
+        if branch:
+            (_, output) = run_cmd(self.resolve_branch_cmd(),
+                                  cwd=self.path, fail=False)
+            if output:
+                return output.strip()
+            return branch
+        return None
 
     def __str__(self):
         if self.commit and (self.tag or self.branch):