How to resolve git apply errors
0
first off: I'm new to git apply:
I would like to apply a patvh to my repo and when it complained about trailing whitespace. I added --whitespace=fix to my command to make it look like: $ git apply --whitespace=fix ../path/to/patch.diff
BUt even after this, I still get errors:
./path/to/patch.diff:##: trailing whitespace.
// some added comment
./path/to/patch.diff:##: trailing whitespace.
// some more added comment
./path/to/patch.diff:##: trailing whitespace.
if (this == that)
./path/to/patch.diff:##: trailing whitespace.
./path/to/patch.diff:##: trailing whitespace.
"stuff"
file.cpp has type 100644, expected 100755
error: patch failed: path/to/file.cpp:###
error: path/to/file.cpp: patch does not apply
How can I fix this and apply the patch correctly?
git whitespace patch git-apply
asked Nov 26 '18 at 14:34
cerrcerr
3,516114171
add a comment |
0
first off: I'm new to git apply:
I would like to apply a patvh to my repo and when it complained about trailing whitespace. I added --whitespace=fix to my command to make it look like: $ git apply --whitespace=fix ../path/to/patch.diff
BUt even after this, I still get errors:
./path/to/patch.diff:##: trailing whitespace.
// some added comment
./path/to/patch.diff:##: trailing whitespace.
// some more added comment
./path/to/patch.diff:##: trailing whitespace.
if (this == that)
./path/to/patch.diff:##: trailing whitespace.
./path/to/patch.diff:##: trailing whitespace.
"stuff"
file.cpp has type 100644, expected 100755
error: patch failed: path/to/file.cpp:###
error: path/to/file.cpp: patch does not apply
How can I fix this and apply the patch correctly?
git whitespace patch git-apply
asked Nov 26 '18 at 14:34
cerrcerr
3,516114171
The warning about the type mismatch (100644 vs 100755) might be an issue too: it says the file is executable in one case but not the other. As for the apply, I found a few questions that discuss alternative solutions: stackoverflow.com/questions/4770177/git-patch-does-not-apply or stackoverflow.com/questions/14509950/… might have a solution for you, with the--rejectoptions and other--whitespacesettings.
– joanis
Nov 26 '18 at 14:58
add a comment |
0
0
0
first off: I'm new to git apply:
I would like to apply a patvh to my repo and when it complained about trailing whitespace. I added --whitespace=fix to my command to make it look like: $ git apply --whitespace=fix ../path/to/patch.diff
BUt even after this, I still get errors:
./path/to/patch.diff:##: trailing whitespace.
// some added comment
./path/to/patch.diff:##: trailing whitespace.
// some more added comment
./path/to/patch.diff:##: trailing whitespace.
if (this == that)
./path/to/patch.diff:##: trailing whitespace.
./path/to/patch.diff:##: trailing whitespace.
"stuff"
file.cpp has type 100644, expected 100755
error: patch failed: path/to/file.cpp:###
error: path/to/file.cpp: patch does not apply
How can I fix this and apply the patch correctly?
git whitespace patch git-apply
asked Nov 26 '18 at 14:34
cerrcerr
3,516114171
first off: I'm new to git apply:
I would like to apply a patvh to my repo and when it complained about trailing whitespace. I added --whitespace=fix to my command to make it look like: $ git apply --whitespace=fix ../path/to/patch.diff
BUt even after this, I still get errors:
./path/to/patch.diff:##: trailing whitespace.
// some added comment
./path/to/patch.diff:##: trailing whitespace.
// some more added comment
./path/to/patch.diff:##: trailing whitespace.
if (this == that)
./path/to/patch.diff:##: trailing whitespace.
./path/to/patch.diff:##: trailing whitespace.
"stuff"
file.cpp has type 100644, expected 100755
error: patch failed: path/to/file.cpp:###
error: path/to/file.cpp: patch does not apply
How can I fix this and apply the patch correctly?
git whitespace patch git-apply
git whitespace patch git-apply
asked Nov 26 '18 at 14:34
cerrcerr
3,516114171
asked Nov 26 '18 at 14:34
cerrcerr
3,516114171
asked Nov 26 '18 at 14:34
cerrcerr
3,516114171
asked Nov 26 '18 at 14:34
cerrcerr
3,516114171
asked Nov 26 '18 at 14:34
cerrcerr
3,516114171
3,516114171
The warning about the type mismatch (100644 vs 100755) might be an issue too: it says the file is executable in one case but not the other. As for the apply, I found a few questions that discuss alternative solutions: stackoverflow.com/questions/4770177/git-patch-does-not-apply or stackoverflow.com/questions/14509950/… might have a solution for you, with the--rejectoptions and other--whitespacesettings.
– joanis
Nov 26 '18 at 14:58
add a comment |
The warning about the type mismatch (100644 vs 100755) might be an issue too: it says the file is executable in one case but not the other. As for the apply, I found a few questions that discuss alternative solutions: stackoverflow.com/questions/4770177/git-patch-does-not-apply or stackoverflow.com/questions/14509950/… might have a solution for you, with the--rejectoptions and other--whitespacesettings.
– joanis
Nov 26 '18 at 14:58
The warning about the type mismatch (100644 vs 100755) might be an issue too: it says the file is executable in one case but not the other. As for the apply, I found a few questions that discuss alternative solutions: stackoverflow.com/questions/4770177/git-patch-does-not-apply or stackoverflow.com/questions/14509950/… might have a solution for you, with the
--reject options and other --whitespace settings.– joanis
Nov 26 '18 at 14:58
The warning about the type mismatch (100644 vs 100755) might be an issue too: it says the file is executable in one case but not the other. As for the apply, I found a few questions that discuss alternative solutions: stackoverflow.com/questions/4770177/git-patch-does-not-apply or stackoverflow.com/questions/14509950/… might have a solution for you, with the
--reject options and other --whitespace settings.– joanis
Nov 26 '18 at 14:58
add a comment |
0
active
oldest
votes
Your Answer
StackExchange.ifUsing("editor", function () {
StackExchange.using("externalEditor", function () {
StackExchange.using("snippets", function () {
StackExchange.snippets.init();
});
});
}, "code-snippets");
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "1"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});
function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});
}
});
draft saved
draft discarded
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53483356%2fhow-to-resolve-git-apply-errors%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
0
active
oldest
votes
0
active
oldest
votes
active
oldest
votes
active
oldest
votes
draft saved
draft discarded
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
draft saved
draft discarded
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53483356%2fhow-to-resolve-git-apply-errors%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
The warning about the type mismatch (100644 vs 100755) might be an issue too: it says the file is executable in one case but not the other. As for the apply, I found a few questions that discuss alternative solutions: stackoverflow.com/questions/4770177/git-patch-does-not-apply or stackoverflow.com/questions/14509950/… might have a solution for you, with the
--rejectoptions and other--whitespacesettings.– joanis
Nov 26 '18 at 14:58