Katenary/katenary
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Fix doc and syntax

Browse Source
This commit is contained in:
Patrice Ferlet
2021-12-17 11:48:32 +01:00
parent e0382a8b83
commit 6273e5531a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main.go
View File

@@ -34,10 +34,10 @@ func detectGitVersion() (string, error) {
return defaulVersion, errors.New("git executable not found") return defaulVersion, errors.New("git executable not found")
} }
// exec git log -n1 --pretty=format:"%h" // get the latest commit hash
if out, err := exec.Command("git", "log", "-n1", "--pretty=format:%h").Output(); err == nil { if out, err := exec.Command("git", "log", "-n1", "--pretty=format:%h").Output(); err == nil {
latestCommit := strings.TrimSpace(string(out)) latestCommit := strings.TrimSpace(string(out))
// then exec git branch --show-current // then get the current branch/tag
out, err := exec.Command("git", "branch", "--show-current").Output() out, err := exec.Command("git", "branch", "--show-current").Output()
if err != nil { if err != nil {
return defaulVersion, errors.New("git branch --show-current failed") return defaulVersion, errors.New("git branch --show-current failed")
@@ -49,7 +49,6 @@ func detectGitVersion() (string, error) {
if err == nil { if err == nil {
return strings.TrimSpace(string(out)), nil return strings.TrimSpace(string(out)), nil
} else { } else {
return currentBranch + "-" + latestCommit, nil return currentBranch + "-" + latestCommit, nil
} }
} }