davrot/forgejo_backup
1
0
Fork 0
mirror of https://codeberg.org/davrot/forgejo.git synced 2025-05-20 14:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes diff on merged pull requests (#7171)

Browse source
This commit is contained in:
Mario Lubenka 2019-06-12 01:32:08 +02:00 • committed by techknowlogick
parent 499a8a1cdd
commit 1608f63e39
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/pull.go
View file

@ -1144,7 +1144,7 @@ func (pr *PullRequest) UpdatePatch() (err error) {
defer func() {
headGitRepo.RemoveRemote(tmpRemote)
}()
pr.MergeBase, err = headGitRepo.GetMergeBase(tmpRemote, pr.BaseBranch, pr.HeadBranch)
pr.MergeBase, _, err = headGitRepo.GetMergeBase(tmpRemote, pr.BaseBranch, pr.HeadBranch)
if err != nil {
return fmt.Errorf("GetMergeBase: %v", err)
} else if err = pr.Update(); err != nil {