Wrong PR merge commit ID saved (#2007)

tokarchuk/v1.17
Lauris BH 8 years ago committed by Lunny Xiao
parent 4d2ea7dc41
commit 165cf33771
  1. 2
      models/pull.go

@ -328,7 +328,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
return fmt.Errorf("git push: %s", stderr)
}
pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.BaseBranch)
pr.MergedCommitID, err = baseGitRepo.GetBranchCommitID(pr.BaseBranch)
if err != nil {
return fmt.Errorf("GetBranchCommit: %v", err)
}

Loading…
Cancel
Save