cybercinch/go-semantic-release
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

style(internal) clean up code

Browse Source
This commit is contained in:
Sebastian Beisch
2021-04-28 08:35:51 +02:00
committed by Felix Wiedmann
parent 2cd24777b3
commit 5225b12c00
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/gitutil/gitutil.go
View File

@@ -123,22 +123,12 @@ func (g *GitUtil) GetLastVersion() (*semver.Version, *plumbing.Reference, error)
// GetCommits from git hash to HEAD // GetCommits from git hash to HEAD
func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit, error) { func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit, error) {
ref, err := g.Repository.Head()
if err != nil {
return nil, err
}
excludeIter, err := g.Repository.Log(&git.LogOptions{From: lastTagHash.Hash()}) excludeIter, err := g.Repository.Log(&git.LogOptions{From: lastTagHash.Hash()})
if err != nil { if err != nil {
return nil, err return nil, err
} }
startCommit, err := g.Repository.CommitObject(ref.Hash())
if err != nil {
return nil, err
}
seen := map[plumbing.Hash]struct{}{} seen := map[plumbing.Hash]struct{}{}
err = excludeIter.ForEach(func(c *object.Commit) error { err = excludeIter.ForEach(func(c *object.Commit) error {
seen[c.Hash] = struct{}{} seen[c.Hash] = struct{}{}
return nil return nil
@@ -152,6 +142,14 @@ func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit,
return !ok && len(commit.ParentHashes) < 2 return !ok && len(commit.ParentHashes) < 2
} }
ref, err := g.Repository.Head()
if err != nil {
return nil, err
}
startCommit, err := g.Repository.CommitObject(ref.Hash())
if err != nil {
return nil, err
}
cIter := object.NewFilterCommitIter(startCommit, &isValid, nil) cIter := object.NewFilterCommitIter(startCommit, &isValid, nil)
commits := make(map[string]shared.Commit) commits := make(map[string]shared.Commit)
@@ -165,7 +163,6 @@ func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit,
} }
return nil return nil
}) })
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Could not read commits, check git clone depth in your ci") return nil, errors.Wrap(err, "Could not read commits, check git clone depth in your ci")
} }