tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal/build: fix commit extraction for detached head repo (#18315)

Browse Source 
* Fix commit extraction

* Comments for commit extraction

Requested in https://github.com/ethereum/go-ethereum/pull/18315
This commit is contained in:
Aleksey @soar Smyrnov 2019-08-08 12:05:35 +03:00 committed by Péter Szilágyi
parent f891fd9875
commit f3478f2899
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/build/env.go
View File

@ -20,6 +20,7 @@ import (
"flag" "flag"
"fmt" "fmt"
"os" "os"
"regexp"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@ -99,6 +100,13 @@ func LocalEnv() Environment {
if fields := strings.Fields(head); len(fields) == 2 { if fields := strings.Fields(head); len(fields) == 2 {
head = fields[1] head = fields[1]
} else { } else {
// In this case we are in "detached head" state
// see: https://git-scm.com/docs/git-checkout#_detached_head
// Additional check required to verify, that file contains commit hash
commitRe, _ := regexp.Compile("^([0-9a-f]{40})$")
if commit := commitRe.FindString(head); commit != "" && env.Commit == "" {
env.Commit = commit
}
return env return env
} }
if env.Commit == "" { if env.Commit == "" {