Merge pull request #71 from lschwahn/fix/64-lightweight-tags

dcoraboeuf · web-flow · commit 9f4ec5a6ee50 · 2020-01-31T19:45:40.000+01:00
Consider Lightweight Tags
diff --git a/src/main/groovy/net/nemerosa/versioning/git/GitInfoService.groovy b/src/main/groovy/net/nemerosa/versioning/git/GitInfoService.groovy
@@ -88,7 +88,7 @@ class GitInfoService implements SCMInfoService {
                     tag = null
                 }
             } else {
-                String described = grgit.repository.jgit.describe().setLong(true).call()
+                String described = grgit.repository.jgit.describe().setTags(true).setLong(true).call()
                 if (described) {
                     // The format returned by the long version of the `describe` command is: <tag>-<number>-<commit>
                     def m = described =~ /^(.*)-(\d+)-g([0-9a-f]+)$/

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class GitInfoService implements SCMInfoService {`
`88`	`88`	`tag = null`
`89`	`89`	`}`
`90`	`90`	`} else {`
`91`		`- String described = grgit.repository.jgit.describe().setLong(true).call()`
	`91`	`+ String described = grgit.repository.jgit.describe().setTags(true).setLong(true).call()`
`92`	`92`	`if (described) {`
`93`	`93`	// The format returned by the long version of the `describe` command is: <tag>-<number>-<commit>
`94`	`94`	`def m = described =~ /^(.*)-(\d+)-g([0-9a-f]+)$/`