Fix panic in API pulls when headbranch does not exist #10676
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Andrew Thornton <art27@cantab.net>
|
I'm fairly certain that 1.11 will be affected too. |
GiteaBot
added
the
lgtm/need 2
Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
lafriks
reviewed
Mar 8, 2020
Codecov Report
@@ Coverage Diff @@
## master #10676 +/- ##
==========================================
- Coverage 43.59% 43.55% -0.04%
==========================================
Files 589 589
Lines 82561 82565 +4
==========================================
- Hits 35996 35965 -31
- Misses 42104 42146 +42
+ Partials 4461 4454 -7
Continue to review full report at Codecov.
|
lafriks
approved these changes
Mar 8, 2020
GiteaBot
added
lgtm/need 1
guillep2k
approved these changes
Mar 8, 2020
GiteaBot
added
lgtm/done
lunny
reviewed
Mar 9, 2020
5 tasks
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Mar 22, 2020
Backport go-gitea#10676 * Fix panic in API pulls when headbranch does not exist * refix other reference to plumbing.ErrReferenceNotFound Signed-off-by: Andrew Thornton <art27@cantab.net>
lafriks
added a commit
that referenced
this pull request
Mar 23, 2020
…mitID (#10676) (#10797) * Fix panic in API pulls when headbranch does not exist (#10676) Backport #10676 * Fix panic in API pulls when headbranch does not exist * refix other reference to plumbing.ErrReferenceNotFound Signed-off-by: Andrew Thornton <art27@cantab.net> * Apply suggestions from code review Co-Authored-By: Lauris BH <lauris@nix.lv>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a branch of a forked repository is merged as a PR and then deleted
/api/v1/repos/owner/name/pullsand/api/v1/repos/owner/name/pulls/indexwill cause a 500 with a panic internally.This is because:
GetRefCommitID(name string)does not return agit.ErrNotExisterrorlog.Error("GetBranch[%s]: %v", headBranch.Name, err)causes a NPE because headBranch is nil as determined a few lines earlier.These are now fixed.
Fix #10639
Signed-off-by: Andrew Thornton art27@cantab.net