[release/1.4.15] internal/build: use less edgy command to get the branch name

(cherry picked from commit b4b5921dd030568717d33b03739d65c3aeb9d9af)
2016-10-03 10:22:14 +02:00 · 2016-10-03 10:22:14 +02:00 · ee58202f2f
commit ee58202f2f
parent 9315bc9c3c
1 changed files with 3 additions and 1 deletions
--- a/internal/build/env.go
+++ b/internal/build/env.go
@ -84,7 +84,9 @@ func LocalEnv() Environment {
 		env.Commit = RunGit("rev-parse", "HEAD")
 	}
 	if env.Branch == "" {
-		env.Branch = RunGit("symbolic-ref", "-q", "--short", "HEAD")
+		if b := RunGit("rev-parse", "--abbrev-ref", "HEAD"); b != "HEAD" {
+			env.Branch = b
+		}
 	}
 	// Note that we don't get the current git tag. It would slow down
 	// builds and isn't used by anything.