fix issues with applying PR patch in --from-pr #3414
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
boegel
changed the title
boegel
requested changes
Aug 18, 2020
boegel
reviewed
Aug 18, 2020
Flamefire
force-pushed
the
fix_git_patch_permissions
branch
from
0d55a77 to
176028d
Compare
Flamefire
force-pushed
the
fix_git_patch_permissions
branch
from
1955deb to
75c1f62
Compare
boegel
requested changes
Aug 18, 2020
Co-authored-by: Kenneth Hoste <[email protected]>
Changing into the directory of the patch is not required and might even lead to unexpected results as calling code will suddenly run in a different PWD if the patch happens to be compressed
boegel
requested changes
Aug 18, 2020
boegel
requested changes
Aug 18, 2020
Member
boegel
left a comment
boegel
left a comment
There was a problem hiding this comment.
We need to get this covered by the tests too, done in Flamefire#3
enhance test for apply_patch to also cover applying patches with git
Flamefire
commented
Aug 18, 2020
boegel
approved these changes
Aug 18, 2020
1 task
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 PRs introduce only new files determining the patch level fails which makes it skip the whole
git ampart even though the level is not even required. Hence as a first part of the fix the level determination is skipped when using git to apply the patch.Secondly
git amrequires an active git repo but we download the base branch via the archive, not a clone. Also the parameterpatchis likely wrong as I can't find it in the docu. Hence replace that withgit applywhich does work for regular folders too.Fixes #3411