···

       
205
       
205
       
 
       


     

       
206
       
206
       
 
       
func (g *GitRepo) commitsBetween(newCommit, oldCommit *object.Commit) ([]*object.Commit, error) {

     

       
207
       
207
       
 
       
	var commits []*object.Commit

     

       
208
       
208
       
-
       
	current := newCommit

     

       
209
       
208
       
 
       


     

       
210
       
210
       
-
       
	for {

     

       
211
       
211
       
-
       
		if current.Hash == oldCommit.Hash {

     

       
212
       
212
       
-
       
			break

     

       
213
       
213
       
-
       
		}

     

       
214
       
214
       
-
       


     

       
215
       
215
       
-
       
		commits = append(commits, current)

     

       
209
       
209
       
+
       
	output, err := g.revList(

     

       
210
       
210
       
+
       
		"--no-merges", // format-patch explicitly prepares only non-merges

     

       
211
       
211
       
+
       
		fmt.Sprintf("%s..%s", oldCommit.Hash.String(), newCommit.Hash.String()),

     

       
212
       
212
       
+
       
	)

     

       
213
       
213
       
+
       
	if err != nil {

     

       
214
       
214
       
+
       
		return nil, fmt.Errorf("revlist: %w", err)

     

       
215
       
215
       
+
       
	}

     

       
216
       
216
       
 
       


     

       
217
       
217
       
-
       
		if len(current.ParentHashes) == 0 {

     

       
218
       
218
       
-
       
			return nil, fmt.Errorf("old commit %s not found in history of new commit %s", oldCommit.Hash, newCommit.Hash)

     

       
219
       
219
       
-
       
		}

     

       
217
       
217
       
+
       
	lines := strings.Split(strings.TrimSpace(string(output)), "\n")

     

       
218
       
218
       
+
       
	if len(lines) == 1 && lines[0] == "" {

     

       
219
       
219
       
+
       
		return commits, nil

     

       
220
       
220
       
+
       
	}

     

       
220
       
221
       
 
       


     

       
221
       
221
       
-
       
		parent, err := current.Parents().Next()

     

       
222
       
222
       
+
       
	for _, item := range lines {

     

       
223
       
223
       
+
       
		obj, err := g.r.CommitObject(plumbing.NewHash(item))

     

       
222
       
224
       
 
       
		if err != nil {

     

       
223
       
223
       
-
       
			return nil, fmt.Errorf("error getting parent: %w", err)

     

       
225
       
225
       
+
       
			continue

     

       
224
       
226
       
 
       
		}

     

       
225
       
227
       
 
       


     

       
226
       
226
       
-
       
		current = parent

     

       
228
       
228
       
+
       
		commits = append(commits, obj)

     

       
227
       
229
       
 
       
	}

     

       
228
       
230
       
 
       


     

       
229
       
231
       
 
       
	return commits, nil