Merge pull request #77 from armanbilge/fix/mima-ignore-head

Make `previousReleases` strictly previous
typelevel · Jan 18, 2022 · aeac2d2 · aeac2d2
2 parents 53c2f93 + 31b32bb
commit aeac2d2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/kernel/src/main/scala/org/typelevel/sbt/kernel/GitHelper.scala b/kernel/src/main/scala/org/typelevel/sbt/kernel/GitHelper.scala
@@ -23,13 +23,15 @@ import scala.sys.process._
 object GitHelper {
 
   /**
+   * Returns a list of strictly previous releases (i.e. ignores tags on HEAD).
    * @param fromHead
    *   if `true`, only tags reachable from HEAD's history. If `false`, all tags in the repo.
    */
   def previousReleases(fromHead: Boolean = false): List[V] = {
     Try {
-      val merged = if (fromHead) " --merged" else ""
-      s"git tag --list$merged".!!.split("\n").toList.map(_.trim).collect {
+      val merged = if (fromHead) " --merged HEAD" else ""
+      // --no-contains omits tags on HEAD
+      s"git tag --no-contains HEAD$merged".!!.split("\n").toList.map(_.trim).collect {
         case V.Tag(version) => version
       }
     }.getOrElse(List.empty).sorted.reverse