Remove incorrect and redundant options from git apply command line #877
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
In d0712f6 `patch -Np1 -i` was replaced with `git apply -Np1`, but `-N` flag has a different meaning in git: > mark new files with `git add --intent-to-add` Additionally the flag was added in v2.19.0, while git version used on perf.rust-lang.org is apparently older and execution fails with error: > unknown switch `N' The default behaviour of git apply should be sufficient to match the original one. Remove all flags from the command line.
bjorn3
approved these changes
May 27, 2021
|
Thanks for fixing this @tmiasko! Looks like I'm running |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In d0712f6
patch -Np1 -iwas replacedwith
git apply -Np1, but-Nflag has a different meaning in git:Additionally the flag was added in v2.19.0, while git version used on
perf.rust-lang.org is apparently older and execution fails with error:
The default behaviour of git apply should be sufficient to match the
original one. Remove all flags from the command line.