From 449ed95bbe73fb88159e061352fcc786987d7d7d Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 21 Oct 2019 09:09:11 -0300 Subject: [PATCH] Revert "fix: getTag return incorrect tag, if we have more than 1 tag for 1 commit (#1164)" This reverts commit 2403a40979cc0b2ce252abfdb7aacd00b91b4ab8. --- internal/pipe/git/git.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/internal/pipe/git/git.go b/internal/pipe/git/git.go index 5c689f01ff0..c7e35c37116 100644 --- a/internal/pipe/git/git.go +++ b/internal/pipe/git/git.go @@ -74,7 +74,7 @@ func getGitInfo() (context.GitInfo, error) { return context.GitInfo{}, errors.Wrap(err, "couldn't get remote URL") } tag, err := getTag() - if err != nil || tag == "" { + if err != nil { return context.GitInfo{ Commit: full, FullCommit: full, @@ -122,12 +122,7 @@ func getFullCommit() (string, error) { } func getTag() (string, error) { - // Even when version sort is used in git-tag[1], tagnames with the same base version - // but different suffixes are still sorted lexicographically, resulting e.g. in prerelease tags - // appearing after the main release (e.g. "1.0-rc1" after "1.0"). - // This variable can be specified to determine the sorting order of tags with different suffixes. - // https://git-scm.com/docs/git-config/2.19.2#git-config-versionsortsuffix - return git.Clean(git.Run("-c", "versionsort.suffix=-", "tag", "-l", "--sort=-v:refname")) + return git.Clean(git.Run("describe", "--tags", "--abbrev=0")) } func getURL() (string, error) {