Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: getting previous tag
Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>
  • Loading branch information
caarlos0 committed Oct 18, 2022
1 parent 27cbbd8 commit f90df0f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions internal/pipe/git/git.go
Expand Up @@ -205,11 +205,11 @@ func getCommitDate(ctx *context.Context) (time.Time, error) {
}

func getShortCommit(ctx *context.Context) (string, error) {
return git.Clean(git.Run(ctx, "show", "--format='%h'", "HEAD", "--quiet"))
return git.Clean(git.Run(ctx, "show", "--format=%h", "HEAD", "--quiet"))
}

func getFullCommit(ctx *context.Context) (string, error) {
return git.Clean(git.Run(ctx, "show", "--format='%H'", "HEAD", "--quiet"))
return git.Clean(git.Run(ctx, "show", "--format=%H", "HEAD", "--quiet"))
}

func getSummary(ctx *context.Context) (string, error) {
Expand Down Expand Up @@ -294,7 +294,7 @@ func previousTagSha(ctx *context.Context, current string) (string, error) {
if err != nil {
return "", err
}
return git.Clean(git.Run(ctx, "show", "--format='%h'", tag, "--quiet"))
return git.Clean(git.Run(ctx, "rev-list", "-n1", tag))
}

func getURL(ctx *context.Context) (string, error) {
Expand Down
6 changes: 4 additions & 2 deletions internal/pipe/git/git_test.go
Expand Up @@ -192,11 +192,13 @@ func TestValidState(t *testing.T) {
testlib.GitRemoteAdd(t, "git@github.com:foo/bar.git")
testlib.GitCommit(t, "commit3")
testlib.GitTag(t, "v0.0.1")
testlib.GitCommit(t, "commit4")
testlib.GitTag(t, "v0.0.2")
testlib.GitCommit(t, "commit4")
testlib.GitTag(t, "v0.0.3")
ctx := context.New(config.Project{})
require.NoError(t, Pipe{}.Run(ctx))
require.Equal(t, "v0.0.2", ctx.Git.CurrentTag)
require.Equal(t, "v0.0.2", ctx.Git.PreviousTag)
require.Equal(t, "v0.0.3", ctx.Git.CurrentTag)
require.Equal(t, "git@github.com:foo/bar.git", ctx.Git.URL)
}

Expand Down

0 comments on commit f90df0f

Please sign in to comment.