fix(pull): show changed files of pull requests without merge base - #39228
Open
4RH1T3CT0R7 wants to merge 1 commit into
Open
fix(pull): show changed files of pull requests without merge base#392284RH1T3CT0R7 wants to merge 1 commit into
4RH1T3CT0R7 wants to merge 1 commit into
Conversation
When head and base have no merge base, GetCompareInfo leaves CompareBase empty and viewPullFiles looked up an empty commit ID, so the files tab returned 404 (400 on older releases). Diff against the empty tree instead, and let gitdiff accept the empty tree as a diff base rather than loading it as a commit.
GiteaBot
added
the
lgtm/need 2
Contributor
Author
|
Assisted-by: Claude Code |
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 pull request's head and base have no merge base, GetCompareInfo leaves CompareBase empty and viewPullFiles looks up an empty commit ID, so the Files Changed tab returns 404 (400 on older releases). Such pull requests are still created through the API, or appear when a branch is rewritten after the pull request was opened.
Without a merge base, the pull request brings in the whole head tree, so the files view now diffs against the empty tree, and gitdiff accepts the empty tree SHA as a diff base instead of loading it as a commit. Only the files tab changes: the commits tab still lists no commits for such pull requests and merging them is unaffected. Covered by a new integration test that fails on main and passes with this change.
Fixes #36644