Skip to content

Commit

Permalink
Merge pull request #248 from adpi2/perf/git-described-version
Browse files Browse the repository at this point in the history
Perf: Eliminate redundant call to `git.describedVersion`
  • Loading branch information
SethTisue authored Sep 18, 2024
2 parents f079e4b + ebd8d34 commit 76cb0e4
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion src/main/scala/com/github/sbt/git/GitPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,15 @@ object SbtGit {
commands += GitCommand.command,
gitTagToVersionNumber := git.defaultTagByVersionStrategy,
gitDescribePatterns := Seq.empty[String],
gitDescribedVersion := gitReader.value.withGit(_.describedVersion((ThisProject / gitDescribePatterns).value)).map(v => git.gitTagToVersionNumber.value(v).getOrElse(v)),
gitDescribedVersion := {
val projectPatterns = gitDescribePatterns.value
val buildPatterns = (ThisBuild / gitDescribePatterns).value
val projectTagToVersionNumber = gitTagToVersionNumber.value
val buildTagToVersionNumber = (ThisBuild / gitTagToVersionNumber).value
if (projectPatterns == buildPatterns && projectTagToVersionNumber == buildTagToVersionNumber)
(ThisBuild / gitDescribedVersion).value
else gitReader.value.withGit(_.describedVersion(projectPatterns)).map(v => projectTagToVersionNumber(v).getOrElse(v))
},
)

/** A Predefined setting to use JGit runner for git. */
Expand Down

0 comments on commit 76cb0e4

Please sign in to comment.