summaryrefslogtreecommitdiff
path: root/project/Release.scala
diff options
context:
space:
mode:
Diffstat (limited to 'project/Release.scala')
-rw-r--r--project/Release.scala8
1 files changed, 6 insertions, 2 deletions
diff --git a/project/Release.scala b/project/Release.scala
index a8dc14988e..38111c18a3 100644
--- a/project/Release.scala
+++ b/project/Release.scala
@@ -94,8 +94,12 @@ object Release {
def trace (t: ⇒ Throwable): Unit = ()
def stdoutString = stdout.toString
}
- git("describe", "HEAD", "--abbrev=7", "--match", "dev")(baseDirectory, outputStealer)
- outputStealer.stdoutString
+ val result = try {
+ git("describe", "HEAD", "--abbrev=7", "--match", "dev")(baseDirectory, outputStealer)
+ } catch {
+ case t => git("describe", "HEAD", "--abbrev=7", "--always")(baseDirectory, outputStealer)
+ }
+ result.trim
}
}