Commit ab7adb00 authored by Péter Szilágyi's avatar Péter Szilágyi Committed by GitHub

Merge pull request #3073 from fjl/build-git17

internal/build: use less edgy command to get the branch name
parents c683e4aa b4b5921d
...@@ -84,7 +84,9 @@ func LocalEnv() Environment { ...@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment