From e80d2070319382175da0f37703b1bb82e3cb8f3b Mon Sep 17 00:00:00 2001 From: "Joseph K. Strauss" Date: Fri, 11 May 2018 15:52:47 -0400 Subject: Optimize calculation of commit count (#316) Instead of count all commits back to the beginning of time twice, and then subtracting, just make one call to let git figure it out. --- build.sc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sc b/build.sc index e1a0ba02..341ea1cc 100755 --- a/build.sc +++ b/build.sc @@ -395,8 +395,7 @@ def publishVersion = T.input{ val latestTaggedVersion = %%('git, 'describe, "--abbrev=0", "--tags")(pwd).out.trim val commitsSinceLastTag = - %%('git, "rev-list", gitHead(), "--count")(pwd).out.trim.toInt - - %%('git, "rev-list", latestTaggedVersion, "--count")(pwd).out.trim.toInt + %%('git, "rev-list", gitHead(), "--not", latestTaggedVersion, "--count")(pwd).out.trim.toInt (latestTaggedVersion, s"$latestTaggedVersion-$commitsSinceLastTag-${gitHead().take(6)}$dirtySuffix") } -- cgit v1.2.3