public/gitea
1
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-26 06:16:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixes diff on merged pull requests (#7171)

Browse Source
This commit is contained in:
Mario Lubenka authored and techknowlogick committed 2019-06-11 19:32:08 -04:00
1 parent 499a8a1cdd
commit 1608f63e39
3 files changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

models/pull.go
+1 -1
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 {