@@ -123,22 +123,12 @@ func (g *GitUtil) GetLastVersion() (*semver.Version, *plumbing.Reference, error)
123
123
// GetCommits from git hash to HEAD
124
124
func (g * GitUtil ) GetCommits (lastTagHash * plumbing.Reference ) ([]shared.Commit , error ) {
125
125
126
- ref , err := g .Repository .Head ()
127
- if err != nil {
128
- return nil , err
129
- }
130
-
131
126
excludeIter , err := g .Repository .Log (& git.LogOptions {From : lastTagHash .Hash ()})
132
127
if err != nil {
133
128
return nil , err
134
129
}
135
130
136
- startCommit , err := g .Repository .CommitObject (ref .Hash ())
137
- if err != nil {
138
- return nil , err
139
- }
140
131
seen := map [plumbing.Hash ]struct {}{}
141
-
142
132
err = excludeIter .ForEach (func (c * object.Commit ) error {
143
133
seen [c .Hash ] = struct {}{}
144
134
return nil
@@ -152,6 +142,14 @@ func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit,
152
142
return ! ok && len (commit .ParentHashes ) < 2
153
143
}
154
144
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
+ }
155
153
cIter := object .NewFilterCommitIter (startCommit , & isValid , nil )
156
154
157
155
commits := make (map [string ]shared.Commit )
@@ -165,7 +163,6 @@ func (g *GitUtil) GetCommits(lastTagHash *plumbing.Reference) ([]shared.Commit,
165
163
}
166
164
return nil
167
165
})
168
-
169
166
if err != nil {
170
167
return nil , errors .Wrap (err , "Could not read commits, check git clone depth in your ci" )
171
168
}
0 commit comments