Append +0 to first dirty commit after tag

Fixes sbt#52
leonardehrenfried · Feb 25, 2018 · 437a704 · 437a704
1 parent 7c54d8c
commit 437a704
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/scala/sbtdynver/DynVerPlugin.scala b/src/main/scala/sbtdynver/DynVerPlugin.scala
@@ -69,7 +69,12 @@ object GitDirtySuffix extends (String => GitDirtySuffix) {
 }
 
 final case class GitDescribeOutput(ref: GitRef, commitSuffix: GitCommitSuffix, dirtySuffix: GitDirtySuffix) {
-  def version: String            = ref.dropV.value + commitSuffix.mkString("+", "-", "") + dirtySuffix.value
+  def version: String            = {
+    if(isDirtyAfterTag) s"${ref.dropV.value}+0-${dirtySuffix.dropPlus.value}"
+    else ref.dropV.value + commitSuffix.mkString("+", "-", "") + dirtySuffix.value
+  }
+
+  def isDirtyAfterTag            = commitSuffix.distance == 0 && ref.isTag && isDirty()
   def isSnapshot(): Boolean      = isDirty() || hasNoTags() || commitSuffix.distance > 0
   def isVersionStable(): Boolean = !isDirty()
 

diff --git a/src/test/scala/sbtdynver/DynVerSpec.scala b/src/test/scala/sbtdynver/DynVerSpec.scala
@@ -10,7 +10,7 @@ object VersionSpec extends Properties("VersionSpec") {
   property("on commit, w/o local changes")                  = onCommit().version()            ?= "1234abcd"
   property("on commit with local changes")                  = onCommitDirty().version()       ?= "1234abcd+20160917-0000"
   property("on tag v1.0.0, w/o local changes")              = onTag().version()               ?= "1.0.0"
-  property("on tag v1.0.0 with local changes")              = onTagDirty().version()          ?= "1.0.0+20160917-0000"
+  property("on tag v1.0.0 with local changes")              = onTagDirty().version()          ?= "1.0.0+0-20160917-0000"
   property("on tag v1.0.0 and 1 commit, w/o local changes") = onTagAndCommit().version()      ?= "1.0.0+1-1234abcd"
   property("on tag v1.0.0 and 1 commit with local changes") = onTagAndCommitDirty().version() ?= "1.0.0+1-1234abcd+20160917-0000"
 }