Просмотр исходного кода

Merge pull request #3073 from fjl/build-git17

internal/build: use less edgy command to get the branch name
Péter Szilágyi 9 лет назад
Родитель
Сommit
ab7adb0027
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      internal/build/env.go

+ 3 - 1
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.