Merge pull request #3352 from fjl/build-git-tag

karalabe · web-flow · commit 2b9cd71d67cd · 2016-11-28T10:33:12.000+02:00
internal/build: use 'git tag --points-at' to get the current tag
diff --git a/internal/build/env.go b/internal/build/env.go
@@ -20,6 +20,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"strings"
 )
 
 var (
@@ -89,11 +90,15 @@ func LocalEnv() Environment {
 		}
 	}
 	if env.Tag == "" {
-		env.Tag = RunGit("for-each-ref", "--points-at=HEAD", "--count=1", "--format=%(refname:short)", "refs/tags")
+		env.Tag = firstLine(RunGit("tag", "-l", "--points-at", "HEAD"))
 	}
 	return env
 }
 
+func firstLine(s string) string {
+	return strings.Split(s, "\n")[0]
+}
+
 func applyEnvFlags(env Environment) Environment {
 	if !flag.Parsed() {
 		panic("you need to call flag.Parse before Env or LocalEnv")

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"flag"`
`21`	`21`	`"fmt"`
`22`	`22`	`"os"`
	`23`	`+ "strings"`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`var (`
`@@ -89,11 +90,15 @@ func LocalEnv() Environment {`
`89`	`90`	`}`
`90`	`91`	`}`
`91`	`92`	`if env.Tag == "" {`
`92`		`- env.Tag = RunGit("for-each-ref", "--points-at=HEAD", "--count=1", "--format=%(refname:short)", "refs/tags")`
	`93`	`+ env.Tag = firstLine(RunGit("tag", "-l", "--points-at", "HEAD"))`
`93`	`94`	`}`
`94`	`95`	`return env`
`95`	`96`	`}`
`96`	`97`
	`98`	`+func firstLine(s string) string {`
	`99`	`+ return strings.Split(s, "\n")[0]`
	`100`	`+}`
	`101`	`+`
`97`	`102`	`func applyEnvFlags(env Environment) Environment {`
`98`	`103`	`if !flag.Parsed() {`
`99`	`104`	`panic("you need to call flag.Parse before Env or LocalEnv")`