Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update go-git package. #152

Merged
merged 1 commit into from
Mar 19, 2025
Merged

chore: Update go-git package. #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions git/commits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,31 @@ import (
"github.com/thenativeweb/get-next-version/conventionalcommits"
)

type ConventionalCommmitTypesResult struct {
type ConventionalCommitTypesResult struct {
LatestReleaseVersion *semver.Version
ConventionalCommitTypes []conventionalcommits.Type
}

var ErrNoCommitsFound = errors.New("no commits found")

func GetConventionalCommitTypesSinceLastRelease(repository *git.Repository) (ConventionalCommmitTypesResult, error) {
func GetConventionalCommitTypesSinceLastRelease(repository *git.Repository) (ConventionalCommitTypesResult, error) {
tags, err := GetAllSemVerTags(repository)
if err != nil {
return ConventionalCommmitTypesResult{}, err
return ConventionalCommitTypesResult{}, err
}
head, err := repository.Head()
if err != nil {
if err == plumbing.ErrReferenceNotFound {
return ConventionalCommmitTypesResult{}, ErrNoCommitsFound
return ConventionalCommitTypesResult{}, ErrNoCommitsFound
}
return ConventionalCommmitTypesResult{}, err
return ConventionalCommitTypesResult{}, err
}
commitIterator, err := repository.Log(&git.LogOptions{
From: head.Hash(),
Order: git.LogOrderCommitterTime,
})
if err != nil {
return ConventionalCommmitTypesResult{}, err
return ConventionalCommitTypesResult{}, err
}

currentCommit, currentCommitErr := commitIterator.Next()
Expand All @@ -60,13 +60,13 @@ func GetConventionalCommitTypesSinceLastRelease(repository *git.Repository) (Con

if currentCommitErr != nil {
if currentCommitErr != io.EOF {
return ConventionalCommmitTypesResult{}, currentCommitErr
return ConventionalCommitTypesResult{}, currentCommitErr
}

latestReleaseVersion = semver.MustParse("0.0.0")
}

return ConventionalCommmitTypesResult{
return ConventionalCommitTypesResult{
LatestReleaseVersion: latestReleaseVersion,
ConventionalCommitTypes: conventionalCommitTypes,
}, nil
Expand Down
18 changes: 13 additions & 5 deletions git/commits_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/Masterminds/semver"
gogit "github.com/go-git/go-git/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/thenativeweb/get-next-version/conventionalcommits"
"github.com/thenativeweb/get-next-version/git"
"github.com/thenativeweb/get-next-version/testutil"
Expand Down Expand Up @@ -120,26 +121,33 @@ func TestGetConventionalCommitTypesSinceLatestRelease(t *testing.T) {
}

for _, test := range tests {
repository := testutil.SetUpInMemoryRepository()
worktree, _ := repository.Worktree()
repository, err := testutil.SetUpInMemoryRepository()
require.NoError(t, err)

worktree, err := repository.Worktree()
require.NoError(t, err)

for _, commit := range test.commitHistory {
commitOptions := testutil.CreateCommitOptions()
worktree.Commit(commit.message, commitOptions)
_, err := worktree.Commit(commit.message, commitOptions)
require.NoError(t, err)

if commit.tag == "" {
continue
}

head, _ := repository.Head()
head, err := repository.Head()
require.NoError(t, err)

var createTagOpts *gogit.CreateTagOptions
if test.annotateTags {
createTagOpts = &gogit.CreateTagOptions{
Message: "some message",
Tagger: commitOptions.Author,
}
}
repository.CreateTag(commit.tag, head.Hash(), createTagOpts)
_, err = repository.CreateTag(commit.tag, head.Hash(), createTagOpts)
require.NoError(t, err)
}

actual, err := git.GetConventionalCommitTypesSinceLastRelease(repository)
Expand Down
12 changes: 9 additions & 3 deletions git/tags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
gogit "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/thenativeweb/get-next-version/git"
"github.com/thenativeweb/get-next-version/testutil"
)
Expand Down Expand Up @@ -54,18 +55,23 @@ func TestGetAllSemVerTags(t *testing.T) {
}

for _, test := range tests {
repository := testutil.SetUpInMemoryRepository()
repository, err := testutil.SetUpInMemoryRepository()
require.NoError(t, err)

for branchName, tagNames := range test.tagsPerBranch {
worktree, _ := repository.Worktree()
worktree, err := repository.Worktree()
require.NoError(t, err)

worktree.Checkout(&gogit.CheckoutOptions{
Create: true,
Branch: plumbing.ReferenceName(branchName),
})

for _, tagNamesForCommit := range tagNames {
worktree.Commit("some message", testutil.CreateCommitOptions())
head, _ := repository.Head()
head, err := repository.Head()
require.NoError(t, err)

for _, tagName := range tagNamesForCommit {
repository.CreateTag(tagName, head.Hash(), nil)
}
Expand Down
29 changes: 16 additions & 13 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,35 @@ go 1.24.1

require (
github.com/Masterminds/semver v1.5.0
github.com/go-git/go-billy/v5 v5.3.1
github.com/go-git/go-git/v5 v5.4.2
github.com/go-git/go-billy/v5 v5.6.2
github.com/go-git/go-git/v5 v5.14.0
github.com/mattn/go-isatty v0.0.20
github.com/rs/zerolog v1.33.0
github.com/spf13/cobra v1.9.1
github.com/stretchr/testify v1.10.0
golang.org/x/exp v0.0.0-20220713135740-79cabaa25d75
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
)

require (
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.1.5 // indirect
github.com/cloudflare/circl v1.6.0 // indirect
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/skeema/knownhosts v1.3.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/xanzy/ssh-agent v0.3.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/crypto v0.35.0 // indirect
golang.org/x/net v0.36.0 // indirect
golang.org/x/sys v0.30.0 // indirect
Expand Down
Loading