[PATCH/FIXUP 4/2] apply: only pay attention to CRLF in the preimage
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 16, 2017, 18:29 UTC
- Message-ID
- <xmqqpobvl627.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20170813085106.1731-1-tboegi@web.de>
The newly added "patch.has_crlf" member wants to indicate if the incoming patch expects any CRLF line in the patch target, and parse_fragment() implements that logic for "git apply".
Rename the member to "patch.crlf_in_old" to clarify what it means, and fix the logic in parse_fragment() so that it also works correctly when running "git apply -R", where '+' lines correspond to the patch target.
Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
There also is an obvious style fix for comment, but I didn't bother splitting it out to a separate step.
apply.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/apply.c b/apply.c index 7663e63df7..995973da3d 100644 --- a/apply.c +++ b/apply.c @@ -220,7 +220,7 @@ struct patch { unsigned int recount:1; unsigned int conflicted_threeway:1; unsigned int direct_to_threeway:1; - unsigned int has_crlf:1; + unsigned int crlf_in_old:1; struct fragment *fragments; char *result; size_t resultsize; @@ -1663,13 +1663,15 @@ static void check_whitespace(struct apply_state *state, record_ws_error(state, result, line + 1, len - 2, state->linenr); } -/* Check if the patch has context lines with CRLF or - the patch wants to remove lines with CRLF */ +/* + * Check if the patch has context lines with CRLF or + * the patch wants to remove lines with CRLF. + */ static void check_old_for_crlf(struct patch *patch, const char *line, int len) { if (len >= 2 && line[len-1] == '\n' && line[len-2] == '\r') { patch->ws_rule |= WS_CR_AT_EOL; - patch->has_crlf = 1; + patch->crlf_in_old = 1; } } @@ -1730,7 +1732,8 @@ static int parse_fragment(struct apply_state *state, check_whitespace(state, line, len, patch->ws_rule); break; case '-': - check_old_for_crlf(patch, line, len); + if (!state->apply_in_reverse) + check_old_for_crlf(patch, line, len); if (state->apply_in_reverse && state->ws_error_action != nowarn_ws_error) check_whitespace(state, line, len, patch->ws_rule); @@ -1739,6 +1742,8 @@ static int parse_fragment(struct apply_state *state, trailing = 0; break; case '+': + if (state->apply_in_reverse) + check_old_for_crlf(patch, line, len); if (!state->apply_in_reverse && state->ws_error_action != nowarn_ws_error) check_whitespace(state, line, len, patch->ws_rule); @@ -3442,7 +3447,7 @@ static int load_preimage(struct apply_state *state, char *img; struct patch *previous; int status; - int flags = patch->has_crlf ? APPLY_FLAGS_CR_AT_EOL : 0; + int flags = patch->crlf_in_old ? APPLY_FLAGS_CR_AT_EOL : 0; previous = previous_patch(state, patch, &status); if (status)