Correctly handle moved files in apply patch (#22118) #22135
Merged
Conversation
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
Backport go-gitea#22118 Moved files in a patch will result in git apply returning: ``` error: {filename}: No such file or directory ``` This wasn't handled by the git apply patch code. This PR adds handling for this. Fix go-gitea#22083 Signed-off-by: Andrew Thornton <art27@cantab.net>
techknowlogick approved these changes Dec 14, 2022
GiteaBot added the lgtm/need 1 
KN4CK3R approved these changes Dec 14, 2022
GiteaBot added lgtm/done 
techknowlogick added the reviewed/wait-merge 
| make L-G-T-M work |
lunny removed the reviewed/wait-merge 
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
5 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.
Backport #22118
Moved files in a patch will result in git apply returning:
This wasn't handled by the git apply patch code. This PR adds handling for this.
Fix #22083
Signed-off-by: Andrew Thornton art27@cantab.net