Browse Source

Fix PR merge error (#3421)

tags/v1.21.12.1
Ethan Koenig Lauris BH 8 years ago
parent
commit
46c7fe371d
1 changed files with 1 additions and 5 deletions
  1. +1
    -5
      models/pull.go

+ 1
- 5
models/pull.go View File

@@ -298,10 +298,6 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
}() }()


headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name) headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
headGitRepo, err := git.OpenRepository(headRepoPath)
if err != nil {
return fmt.Errorf("OpenRepository: %v", err)
}


// Clone base repo. // Clone base repo.
tmpBasePath := path.Join(LocalCopyPath(), "merge-"+com.ToStr(time.Now().Nanosecond())+".git") 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
return nil return nil
} }


l, err := headGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
l, err := baseGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
if err != nil { if err != nil {
log.Error(4, "CommitsBetweenIDs: %v", err) log.Error(4, "CommitsBetweenIDs: %v", err)
return nil return nil


Loading…
Cancel
Save