mirror of
https://github.com/go-gitea/gitea.git
synced 2024-11-23 06:16:55 +08:00
fixes wrong after field in webhook payload
when merge pull request
This commit is contained in:
parent
c4b5b121a5
commit
407fbfa6ce
|
@ -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)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user