From 703d3020fbd28e233c94cb690fdd81a8626b8dc1 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Wed, 28 Dec 2016 23:39:31 -0200 Subject: [PATCH] fix tag --- git/tag.go | 11 ++++------- main.go | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/git/tag.go b/git/tag.go index 03ebc9632..823c8b6ed 100644 --- a/git/tag.go +++ b/git/tag.go @@ -3,18 +3,15 @@ package git import ( "os/exec" "strings" + "errors" ) func CurrentTag() (tag string, err error) { return getTag("master") } -func PreviousTag() (tag string, err error) { - current, err := CurrentTag() - if err != nil { - return tag, err - } - return getTag(current + "^") +func PreviousTag(base string) (tag string, err error) { + return getTag(base + "^") } func getTag(ref string) (tag string, err error) { @@ -28,7 +25,7 @@ func getTag(ref string) (tag string, err error) { ) bts, err := cmd.CombinedOutput() if err != nil { - return tag, err + return tag, errors.New(err.Error() + ": " + string(bts)) } return strings.Split(string(bts), "\n")[0], err } diff --git a/main.go b/main.go index 9f23cb08c..dab6b2492 100644 --- a/main.go +++ b/main.go @@ -31,7 +31,7 @@ func main() { if err != nil { log.Fatalln("Failed to create archives", err.Error()) } - previousTag, err := git.PreviousTag() + previousTag, err := git.PreviousTag(tag) if err != nil { log.Fatalln("Failed to get previous tag name", err.Error()) }