From 426c0522dea8b9b57fde1fd1d2a741ad4b963d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Fri, 28 Oct 2016 15:13:10 +0300 Subject: [PATCH] Match on lightweight and containing only major version tags --- src/main/scala/sbtdynver/DynVerPlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/sbtdynver/DynVerPlugin.scala b/src/main/scala/sbtdynver/DynVerPlugin.scala index 05e9b18..66eab4c 100644 --- a/src/main/scala/sbtdynver/DynVerPlugin.scala +++ b/src/main/scala/sbtdynver/DynVerPlugin.scala @@ -88,7 +88,7 @@ final case class DynVer(wd: Option[File]) { def hasNoTags(): Boolean = getGitDescribeOutput(new Date).hasNoTags private[sbtdynver] def getGitDescribeOutput(d: Date) = { - val process = Process(s"""git describe --abbrev=8 --match v[0-9].* --always --dirty=+${timestamp(d)}""", wd) + val process = Process(s"""git describe --tags --abbrev=8 --match v[0-9]* --always --dirty=+${timestamp(d)}""", wd) Try(process !! NoProcessLogger).toOption .map(_.init) .map(_.replaceAll("-([0-9]+)-g([0-9a-f]{8})", "+$1-$2"))