diff options
| author | Mario Lubenka <mario.lubenka@googlemail.com> | 2019-06-12 01:32:08 +0200 |
|---|---|---|
| committer | techknowlogick <hello@techknowlogick.com> | 2019-06-11 19:32:08 -0400 |
| commit | 1608f63e396c78bcbea3605b812556ddf441a6c4 (patch) | |
| tree | ea9fd908eefc3acafce94d79625243b4999258dc /models | |
| parent | 499a8a1cdd815cc25554371598140f5fb01e216f (diff) | |
| download | gitea-1608f63e396c78bcbea3605b812556ddf441a6c4.tar.gz gitea-1608f63e396c78bcbea3605b812556ddf441a6c4.zip | |
Fixes diff on merged pull requests (#7171)
Diffstat (limited to 'models')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |