summaryrefslogtreecommitdiff
path: root/currentVersions.go
diff options
context:
space:
mode:
Diffstat (limited to 'currentVersions.go')
-rw-r--r--currentVersions.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/currentVersions.go b/currentVersions.go
index fdedb74..48563f9 100644
--- a/currentVersions.go
+++ b/currentVersions.go
@@ -38,7 +38,6 @@ func (repo *Repo) setMasterVersion() {
repo.MasterVersion = v
} else {
log.Log(WARN, "gitpb.GitMasterVersion() error:", err)
- repo.MasterVersion = "giterr"
}
}
@@ -134,11 +133,11 @@ func (repo *Repo) gitVersionByName(name string) (string, error) {
if name == "" {
// git will return the current tag
- r, err := repo.RunQuiet([]string{"git", "describe", "--tags"})
+ cmd := []string{"git", "describe", "--tags"}
+ r, err := repo.RunQuiet(cmd)
output := strings.Join(r.Stdout, "\n")
if err != nil {
- log.Log(WARN, "gitDescribeByName() output might have worked anyway:", output)
- log.Log(WARN, "gitDescribeByName() not in a git repo?", err, repo.GetGoPath())
+ log.Log(WARN, repo.FullPath, "gitDescribeByName() ", output, err, cmd)
return "", err
}
return strings.TrimSpace(output), nil