Generate Diff and Patch direct from Pull head (#10936) #10938
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
Backport go-gitea#10936 * Generate Diff and Patch direct from Pull head Fix go-gitea#10932 Also fix "Empty Diff/Patch File when pull is merged" Closes go-gitea#10934 * Add tests to ensure that diff does not change * Ensure diffs and pulls pages work if head branch is deleted too Signed-off-by: Andrew Thornton <art27@cantab.net>
|
This backport is potentially more questionable. The same code is safe in 1.12 because we run a migration to update the mergebase correctly on PRs but 1.11 and earlier do not have this migration so old PRs will have the incorrect mergebase. @lunny's suggest doctor command would help update the mergebase. An alternative would be to have a mixture of the two solutions - one for if the head repo/head branch cannot be found or the PR is merged and the original code if not. |
GiteaBot
added
the
lgtm/need 2
lunny
approved these changes
Apr 3, 2020
GiteaBot
added
lgtm/need 1
jolheiser
approved these changes
Apr 3, 2020
GiteaBot
added
lgtm/done
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.
Backport #10936
Fix #10932
Also fix "Empty Diff/Patch File when pull is merged"
Closes #10934
Signed-off-by: Andrew Thornton art27@cantab.net
See below for a comment on why this code might not necessarily always be correct in 1.11