diff options
| author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-05-19 12:12:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 12:12:27 +0200 |
| commit | 977dcf96e0d9c5dded47ac6066fad8979a9f74f9 (patch) | |
| tree | 0865759f63a668cb4acddc6952bb86de83092851 /models | |
| parent | 281a0389c10b95a48045ebb161ad5492226bad78 (diff) | |
| parent | 407fbfa6ce93b089a41e245d3d05260eeef27153 (diff) | |
| download | gitea-977dcf96e0d9c5dded47ac6066fad8979a9f74f9.tar.gz gitea-977dcf96e0d9c5dded47ac6066fad8979a9f74f9.zip | |
fixes wrong after field in webhook payload (#1746)
Diffstat (limited to 'models')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index aba1046402..64fa51b61b 100644 --- a/models/pull.go +++ b/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.HeadBranch) + pr.MergedCommitID, err = headGitRepo.GetBranchCommitID(pr.BaseBranch) if err != nil { return fmt.Errorf("GetBranchCommit: %v", err) } |