mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 12:15:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fixes wrong after field in webhook payload

Browse source 
when merge pull request
This commit is contained in:
Diep Pham 2017-05-18 12:16:36 +07:00
parent c4b5b121a5
commit 407fbfa6ce
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/pull.go
View file

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