fix: restore last tag with refname method

marcocesarato · Oct 27, 2022 · ef97fb0 · ef97fb0
1 parent d526e80
commit ef97fb0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/.changelog b/.changelog
@@ -16,8 +16,8 @@ return [
     ],
     'releaseCommitMessageFormat' => "{$releaseMessagePrefix}{{currentTag}}",
     'postRun' => function () use ($releaseMessagePrefix) {
-        $lastTag = Repository::getLastTag();
-        $lastTagCommit = Repository::getLastTagCommit();
+        $lastTag = Repository::getLastTagRefname();
+        $lastTagCommit = Repository::getLastTagRefnameCommit();
         $lastCommit = Repository::getLastCommit();
 
         if ($lastTagCommit !== $lastCommit) {

diff --git a/src/Git/Repository.php b/src/Git/Repository.php
@@ -52,6 +52,15 @@ public static function getLastCommit(): string
         return self::run('git log -1 --pretty=format:%H');
     }
 
+        /**
+     * Get last tag.
+     */
+    public static function getLastTagRefname($prefix = '', $merged = false): string
+    {
+        $merged = $merged ? '--merged' : '';
+        return self::run('git for-each-ref ' /* 'refs/tags/" . $prefix . "*' */ . " --sort=-v:refname --format='%(refname:strip=2)' --count=1 {$merged}");
+    }
+
     /**
      * Get last tag.
      */
@@ -125,6 +134,16 @@ public static function getLastTagCommit($prefix = ''): string
         return self::run("git rev-parse --verify {$lastTag}");
     }
 
+     /**
+     * Get last tag commit hash.
+     */
+    public static function getLastTagRefnameCommit($prefix = ''): string
+    {
+        $lastTag = self::getLastTagRefname($prefix);
+
+        return self::run("git rev-parse --verify {$lastTag}");
+    }
+
     /**
      * Get current branch name.
      */