yume/act
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: clean code

Browse source
This commit is contained in:
Carlos Alexandro Becker 2019-05-23 01:45:50 -03:00
parent 01f7ff315c
commit 9fd6310363
No known key found for this signature in database
GPG key ID: E61E2F7DC14AB940
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/git.go
View file

@ -68,24 +68,16 @@ func FindGitRef(file string) (string, error) {
log.Debugf("HEAD points to '%s'", ref) log.Debugf("HEAD points to '%s'", ref)
tag, err := findGitPrettyRef(ref, gitDir)
if err != nil || tag != "" {
return tag, err
}
return ref, nil
}
func findGitPrettyRef(head, gitDir string) (string, error) {
// try tags first // try tags first
tag, err := findGitPrettyRefOn(head, gitDir, "refs/tags") tag, err := findGitPrettyRef(ref, gitDir, "refs/tags")
if err != nil || tag != "" { if err != nil || tag != "" {
return tag, err return tag, err
} }
// and then branches // and then branches
return findGitPrettyRefOn(head, gitDir, "refs/heads") return findGitPrettyRef(ref, gitDir, "refs/heads")
} }
func findGitPrettyRefOn(head, root, sub string) (string, error) { func findGitPrettyRef(head, root, sub string) (string, error) {
var name string var name string
var err = filepath.Walk(filepath.Join(root, sub), func(path string, info os.FileInfo, err error) error { var err = filepath.Walk(filepath.Join(root, sub), func(path string, info os.FileInfo, err error) error {
if err != nil { if err != nil {