cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3073 from fjl/build-git17

Browse Source 
internal/build: use less edgy command to get the branch name
This commit is contained in:
Péter Szilágyi 2016-10-03 11:34:28 +03:00 committed by GitHub
commit ab7adb0027
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/build/env.go
View File

@ -84,7 +84,9 @@ func LocalEnv() Environment {
env.Commit = RunGit("rev-parse", "HEAD") env.Commit = RunGit("rev-parse", "HEAD")
} }
if env.Branch == "" { 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 // Note that we don't get the current git tag. It would slow down
// builds and isn't used by anything. // builds and isn't used by anything.