diff --git a/sv/formatter.go b/sv/formatter.go index 45d32c9..d4ef8f2 100644 --- a/sv/formatter.go +++ b/sv/formatter.go @@ -2,7 +2,6 @@ package sv import ( "bytes" - "fmt" "text/template" ) @@ -96,7 +95,7 @@ func releaseNoteVariables(releasenote ReleaseNote) releaseNoteTemplateVariables var version = "" if releasenote.Version != nil { - version = fmt.Sprintf("%d.%d.%d", releasenote.Version.Major(), releasenote.Version.Minor(), releasenote.Version.Patch()) + version = releasenote.Version.String() } return releaseNoteTemplateVariables{ Version: version, diff --git a/sv/git.go b/sv/git.go index 0b94c13..5c5b662 100644 --- a/sv/git.go +++ b/sv/git.go @@ -80,7 +80,7 @@ func NewGit(messageProcessor MessageProcessor, cfg TagConfig) *GitImpl { // Describe runs git describe, it no tag found, return empty func (GitImpl) Describe() string { - cmd := exec.Command("git", "describe", "--abbrev=0") + cmd := exec.Command("git", "describe", "--abbrev=0", "--tags") out, err := cmd.CombinedOutput() if err != nil { return "" @@ -138,7 +138,7 @@ func (g GitImpl) Tag(version semver.Version) error { // Tags list repository tags func (g GitImpl) Tags() ([]GitTag, error) { - cmd := exec.Command("git", "tag", "-l", "--format", "%(taggerdate:iso8601)#%(refname:short)") + cmd := exec.Command("git", "for-each-ref", "--sort", "creatordate", "--format", "%(creatordate:iso8601)#%(refname:short)", "refs/tags") out, err := cmd.CombinedOutput() if err != nil { return nil, combinedOutputErr(err, out)