#3999 500 error from the API when call merge on PR that can be merged due to git merge conflict
Closed: Fixed 6 months ago by pingou. Opened 8 months ago by fbo.

To reproduce:

  • Open a PR with code that cannot be merge with the master state.
  • Call the merge API
➜  test-zuul-fork git:(pr15) curl -XPOST -H "Authorization: token XXX"  https://pagure.io/api/0/test-zuul/pull-request/10/merge
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 admin@fedoraproject.org to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>

Looks like we're not catching an exception that the backend (git.py) is throwing. I've received the stacktrace by email, should be straight forward to fix.

Thanks for the report!

Metadata Update from @pingou:
- Issue tagged with: bug, easyfix

8 months ago

Metadata Update from @pingou:
- Issue set to the milestone: 5.3

7 months ago

Metadata Update from @pingou:
- Issue assigned to pingou

6 months ago

Login to comment on this ticket.

Metadata
Related Pull Requests
  • #4178 Merged 6 months ago