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

fjl · karalabe · commit ee58202f2f44 · 2016-10-03T11:36:03.000+03:00
(cherry picked from commit b4b5921)
diff --git 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.

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,9 @@ func LocalEnv() Environment {`
`84`	`84`	`env.Commit = RunGit("rev-parse", "HEAD")`
`85`	`85`	`}`
`86`	`86`	`if env.Branch == "" {`
`87`		`- env.Branch = RunGit("symbolic-ref", "-q", "--short", "HEAD")`
	`87`	`+ if b := RunGit("rev-parse", "--abbrev-ref", "HEAD"); b != "HEAD" {`
	`88`	`+ env.Branch = b`
	`89`	`+ }`
`88`	`90`	`}`
`89`	`91`	`// Note that we don't get the current git tag. It would slow down`
`90`	`92`	`// builds and isn't used by anything.`