From 20899c05a4c87e3cc13b0153db4f0c3919daaa2a Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Sun, 27 Nov 2016 18:40:28 +0100 Subject: internal/build: use 'git tag --points-at' to get the current tag This should restore support for building with git 1.x. --- internal/build/env.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/build/env.go b/internal/build/env.go index 95281df86..15b2dfe41 100644 --- 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") -- cgit