Internal Error after PR merge

[jolheiser]

• Gitea version (or commit ref): d1a4997
• Git version: Whatever try uses
• Operating system:
• Database (use [x]):
  • PostgreSQL
  • MySQL
  • MSSQL
  • SQLite
• Can you reproduce the bug at https://try.gitea.io:
  • Yes https://try.gitea.io/jolheiser/Test1/pulls/6
  • No
  • Not relevant
• Log gist:

Description

1. Create a PR from a branch on same repo
2. Delete branch
3. Restore branch
4. Merge PR (I used default, didn't check other merge styles)

Example error from local

2019/12/16 21:49:23 routers/repo/pull.go:319:PrepareMergedViewPullInfo() [E] GetCompareInfo: exit status 128 - fatal: ambiguous argument 'ffd89af277e933957146da58988b47139abb1e33...refs/pull/1/head': unknown revision or path not in the working tree.
        Use '--' to separate paths from revisions, like this:
        'git <command> [<revision>...] -- [<file>...]'

[bagasme]

@jolheiser What delete branch means?

[jolheiser]

@bagasme

[zeripath]

This is likely because - I in my infinite stupidity - decided not to use and keep updated the internal merge pulls ref on the base branch. We do need to restore that.