Skip to content

Commit 46c7fe3

Browse files
ethantkoeniglafriks
authored andcommitted
Fix PR merge error (#3421)
1 parent 28b8189 commit 46c7fe3

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

models/pull.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,6 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
298298
}()
299299

300300
headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
301-
headGitRepo, err := git.OpenRepository(headRepoPath)
302-
if err != nil {
303-
return fmt.Errorf("OpenRepository: %v", err)
304-
}
305301

306302
// Clone base repo.
307303
tmpBasePath := path.Join(LocalCopyPath(), "merge-"+com.ToStr(time.Now().Nanosecond())+".git")
@@ -441,7 +437,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
441437
return nil
442438
}
443439

444-
l, err := headGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
440+
l, err := baseGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
445441
if err != nil {
446442
log.Error(4, "CommitsBetweenIDs: %v", err)
447443
return nil

0 commit comments

Comments
 (0)