diff options
| author | Diep Pham <me@favadi.com> | 2017-05-18 12:16:36 +0700 |
|---|---|---|
| committer | Diep Pham <me@favadi.com> | 2017-05-18 12:16:36 +0700 |
| commit | 407fbfa6ce93b089a41e245d3d05260eeef27153 (patch) | |
| tree | 69cfe5d3f412094e71339ad166ffb6db58e08c55 | |
| parent | c4b5b121a56310c53b2ece53d09837cbe67b7eff (diff) | |
| download | gitea-407fbfa6ce93b089a41e245d3d05260eeef27153.tar.gz gitea-407fbfa6ce93b089a41e245d3d05260eeef27153.zip | |
fixes wrong after field in webhook payload
when merge pull request
| -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) } |