From: Junio C Hamano <gitster@pobox.com>
To: tboegi@web.de
Cc: git@vger.kernel.org, asottile@umich.edu
Subject: Re: [PATCH v3 2/2] File commited with CRLF should roundtrip diff and apply
Date: Thu, 17 Aug 2017 15:35:48 -0700 [thread overview]
Message-ID: <xmqqh8x5esaj.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170817214308.10727-1-tboegi@web.de> (tboegi@web.de's message of "Thu, 17 Aug 2017 23:43:08 +0200")
tboegi@web.de writes:
> @@ -1712,11 +1726,15 @@ static int parse_fragment(struct apply_state *state,
> if (!deleted && !added)
> leading++;
> trailing++;
> + if (!state->apply_in_reverse)
> + check_old_for_crlf(patch, line, len);
> if (!state->apply_in_reverse &&
> state->ws_error_action == correct_ws_error)
> check_whitespace(state, line, len, patch->ws_rule);
> break;
This one is wrong. You are looking at " " (common context) and you
should unconditionally call check_old for them.
> case '-':
> + if (!state->apply_in_reverse)
> + check_old_for_crlf(patch, line, len);
This is correct.
There is "case '+':" below here you did not touch. There should be
case '+':
+ if (state->apply_in_reverse)
+ check_old_for_crlf(...);
there. Note that we call check_old() only when applying in reverse.
> @@ -2268,8 +2286,11 @@ static void show_stats(struct apply_state *state, struct patch *patch)
> add, pluses, del, minuses);
> }
>
> -static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
> +static int read_old_data(struct stat *st, struct patch *patch,
> + const char *path, struct strbuf *buf)
The order of argument to have the patch structure earlier is
different from my version; what we see here looks much better to me.
> {
> + enum safe_crlf safe_crlf = patch->crlf_in_old ?
> + SAFE_CRLF_KEEP_CRLF : SAFE_CRLF_RENORMALIZE;
> switch (st->st_mode & S_IFMT) {
> case S_IFLNK:
> if (strbuf_readlink(buf, path, st->st_size) < 0)
> @@ -2278,7 +2299,15 @@ static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
> case S_IFREG:
> if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
> return error(_("unable to open or read %s"), path);
> - convert_to_git(&the_index, path, buf->buf, buf->len, buf, 0);
> + /*
> + * "git apply" without "--index/--cached" should never look
> + * at the index; the target file may not have been added to
> + * the index yet, and we may not even be in any Git repository.
> + * Pass NULL to convert_to_git() to stress this; the function
> + * should never look at the index when explicit crlf option
> + * is given.
> + */
> + convert_to_git(NULL, path, buf->buf, buf->len, buf, safe_crlf);
This comment is somewhat strangly indented. I thought opening "/*"
alighs with the usual tab stop.
Thanks.
next prev parent reply other threads:[~2017-08-17 22:36 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-01 18:24 core.autocrlf=true causes `git apply` to fail on patch generated with `git diff-index HEAD --patch` Anthony Sottile
2017-08-01 20:47 ` Torsten Bögershausen
2017-08-01 20:58 ` Anthony Sottile
2017-08-02 15:44 ` Torsten Bögershausen
2017-08-02 20:42 ` [PATCH v1 1/1] correct apply for files commited with CRLF tboegi
2017-08-02 21:13 ` Junio C Hamano
2017-08-04 17:31 ` Torsten Bögershausen
2017-08-04 17:57 ` Junio C Hamano
2017-08-04 19:26 ` Junio C Hamano
2017-08-02 20:58 ` core.autocrlf=true causes `git apply` to fail on patch generated with `git diff-index HEAD --patch` Junio C Hamano
2017-08-12 5:45 ` Torsten Bögershausen
2017-08-12 5:53 ` Torsten Bögershausen
2017-08-12 14:56 ` [PATCH/RFC] convert: Add SAFE_CRLF_KEEP_CRLF tboegi
2017-08-12 14:56 ` [PATCH/RFC] File commited with CRLF should roundtrip diff and apply tboegi
2017-08-14 17:37 ` Junio C Hamano
2017-08-17 6:06 ` [PATCH v2 1/2] convert: Add SAFE_CRLF_KEEP_CRLF tboegi
2017-08-17 6:06 ` [PATCH v2 2/2] File commited with CRLF should roundtrip diff and apply tboegi
2017-08-17 6:37 ` Junio C Hamano
2017-08-17 21:43 ` [PATCH v3 1/2] convert: Add SAFE_CRLF_KEEP_CRLF tboegi
2017-08-17 21:43 ` [PATCH v3 2/2] File commited with CRLF should roundtrip diff and apply tboegi
2017-08-17 22:29 ` Junio C Hamano
2017-08-17 22:35 ` Junio C Hamano [this message]
2017-08-19 11:27 ` [PATCH v4 1/2] convert: Add SAFE_CRLF_KEEP_CRLF tboegi
2017-08-19 11:28 ` [PATCH v4 2/2] File commited with CRLF should roundtrip diff and apply tboegi
2017-08-13 8:51 ` [PATCH/RFC 1/2] convert: Add SAFE_CRLF_KEEP_CRLF tboegi
2017-08-13 8:51 ` [PATCH/RFC 2/2] File commited with CRLF should roundtrip diff and apply tboegi
2017-08-16 18:28 ` Junio C Hamano
2017-08-16 18:28 ` [PATCH/FIXUP 3/2] apply: remove unused member apply_state.flags Junio C Hamano
2017-08-16 18:29 ` [PATCH/FIXUP 4/2] apply: only pay attention to CRLF in the preimage Junio C Hamano
2017-08-16 18:30 ` [PATCH/FIXUP 5/2] apply: localize the CRLF business to read_old_data() Junio C Hamano
2017-08-16 18:34 ` [PATCH/FIXUP 6/2] apply: clarify read_old_data() is about no-index case Junio C Hamano
2017-08-17 6:24 ` Torsten Bögershausen
2017-08-17 7:06 ` Junio C Hamano
2017-08-17 7:12 ` Junio C Hamano
2017-08-17 8:24 ` Torsten Bögershausen
2017-08-17 17:07 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh8x5esaj.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=asottile@umich.edu \
--cc=git@vger.kernel.org \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).