From 1608f63e396c78bcbea3605b812556ddf441a6c4 Mon Sep 17 00:00:00 2001 From: Mario Lubenka Date: Wed, 12 Jun 2019 01:32:08 +0200 Subject: Fixes diff on merged pull requests (#7171) --- models/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'models/pull.go') diff --git a/models/pull.go b/models/pull.go index 5ac1126314..1f03dd9b0f 100644 --- a/models/pull.go +++ b/models/pull.go @@ -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 { -- cgit v1.2.3