Skip to content

fix(api): handle missing base branch in PR commits API#37193

Merged
wxiaoguang merged 6 commits into
go-gitea:mainfrom
Mohit25022005:fix-pr-commits-missing-base
Apr 13, 2026
Merged

fix(api): handle missing base branch in PR commits API#37193
wxiaoguang merged 6 commits into
go-gitea:mainfrom
Mohit25022005:fix-pr-commits-missing-base

Conversation

@Mohit25022005
Copy link
Copy Markdown
Contributor

fix(api): handle missing base branch in PR commits API

Closes #36366

Previously, the PR commits API returned a 500 Internal Server Error
when the base branch was missing due to an unhandled git "bad revision" error.

This change:

  • Checks for base branch existence before performing git operations
  • Returns 404 when the base branch does not exist
  • Prevents git errors from surfacing as 500 responses

This improves API robustness and aligns behavior with expected error handling.

Tested locally by:

  • Creating a pull request
  • Deleting the base branch
  • Verifying that the API returns 404 instead of 500

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 13, 2026
Comment thread routers/api/v1/repo/pull.go Outdated
@Mohit25022005
Copy link
Copy Markdown
Contributor Author

Thanks! This looks cleaner and aligns better with existing patterns. Appreciate the fix.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 13, 2026
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 13, 2026
@lunny lunny added the backport/v1.26 This PR should be backported to Gitea 1.26 label Apr 13, 2026
@bircni bircni added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 13, 2026
@bircni
Copy link
Copy Markdown
Member

bircni commented Apr 13, 2026

@wxiaoguang can you merge?
I'd like to merge all possible backports so we can finally release

@wxiaoguang wxiaoguang enabled auto-merge (squash) April 13, 2026 17:35
@wxiaoguang wxiaoguang merged commit 37396ff into go-gitea:main Apr 13, 2026
26 checks passed
@GiteaBot GiteaBot added this to the 1.27.0 milestone Apr 13, 2026
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 13, 2026
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 13, 2026
Closes go-gitea#36366

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Apr 13, 2026
silverwind pushed a commit that referenced this pull request Apr 13, 2026
Backport #37193 by @Mohit25022005

fix(api): handle missing base branch in PR commits API

Closes #36366

Previously, the PR commits API returned a 500 Internal Server Error
when the base branch was missing due to an unhandled git "bad revision"
error.

This change:
- Checks for base branch existence before performing git operations
- Returns 404 when the base branch does not exist
- Prevents git errors from surfacing as 500 responses

This improves API robustness and aligns behavior with expected error
handling.

Tested locally by:
- Creating a pull request
- Deleting the base branch
- Verifying that the API returns 404 instead of 500

Co-authored-by: Mohit Swarnkar <mohitswarnkar13@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 14, 2026
* main:
  Add comment for the design of "user activity time" (go-gitea#37195)
  fix(api): handle missing base branch in PR commits API (go-gitea#37193)
  Refactor htmx and fetch-action related code (go-gitea#37186)
  Fix encoding for Matrix Webhooks (go-gitea#37190)
  Always show owner/repo name in compare page dropdowns (go-gitea#37172)
  fix(api): handle fork-only commits in compare API (go-gitea#37185)
  Improve Contributing docs and set a release schedule (go-gitea#37109)
  Update Nix flake (go-gitea#37183)
  Remove outdated RunUser logic (go-gitea#37180)
  Refactor flash message and remove SanitizeHTML template func (go-gitea#37179)
  Indicate form field readonly via background (go-gitea#37175)
  Remove dead CSS rules (go-gitea#37173)
  Fix flaky `TestCatFileBatch/QueryTerminated` test (go-gitea#37159)
  Implement logout redirection for reverse proxy auth setups (go-gitea#36085)
  Add missing `//nolint:depguard` (go-gitea#37162)
@Mohit25022005 Mohit25022005 deleted the fix-pr-commits-missing-base branch April 14, 2026 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/done All backports for this PR have been created backport/v1.26 This PR should be backported to Gitea 1.26 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

PR commits API returns with internal server error if the base branch is missing

5 participants