Skip to content

Commit 5225b12

Browse files
Nightapesfwiedmann
authored andcommitted
style(internal) clean up code
1 parent 2cd2477 commit 5225b12

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

internal/gitutil/gitutil.go

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,22 +123,12 @@ func (g *GitUtil) GetLastVersion() (*semver.Version, *plumbing.Reference, error)
123123
// GetCommits from git hash to HEAD
124124
func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit, error) {
125125

126-
ref, err := g.Repository.Head()
127-
if err != nil {
128-
return nil, err
129-
}
130-
131126
excludeIter, err := g.Repository.Log(&git.LogOptions{From: lastTagHash.Hash()})
132127
if err != nil {
133128
return nil, err
134129
}
135130

136-
startCommit, err := g.Repository.CommitObject(ref.Hash())
137-
if err != nil {
138-
return nil, err
139-
}
140131
seen := map[plumbing.Hash]struct{}{}
141-
142132
err = excludeIter.ForEach(func(c *object.Commit) error {
143133
seen[c.Hash] = struct{}{}
144134
return nil
@@ -152,6 +142,14 @@ func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit,
152142
return !ok && len(commit.ParentHashes) < 2
153143
}
154144

145+
ref, err := g.Repository.Head()
146+
if err != nil {
147+
return nil, err
148+
}
149+
startCommit, err := g.Repository.CommitObject(ref.Hash())
150+
if err != nil {
151+
return nil, err
152+
}
155153
cIter := object.NewFilterCommitIter(startCommit, &isValid, nil)
156154

157155
commits := make(map[string]shared.Commit)
@@ -165,7 +163,6 @@ func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit,
165163
}
166164
return nil
167165
})
168-
169166
if err != nil {
170167
return nil, errors.Wrap(err, "Could not read commits, check git clone depth in your ci")
171168
}

0 commit comments

Comments
 (0)