Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 1, 2016, 20:24 UTC
- Message-ID
- <xmqqtwan8kjv.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <CA+P7+xoJb=SukbnJVJrXR6WV9+UtGnsn776KGkrHC7X-T_wZWg@mail.gmail.com>
Jacob Keller <jacob.keller@gmail.com> writes:
Show 14 quoted lines
> On Wed, Nov 30, 2016 at 9:02 AM, <tboegi@web.de> wrote: >> From: Torsten Bögershausen <tboegi@web.de> >> diff --git a/convert.c b/convert.c >> index be91358..f8e4dfe 100644 >> --- a/convert.c >> +++ b/convert.c >> @@ -281,13 +281,13 @@ static int crlf_to_git(const char *path, const char *src, size_t len, >> /* >> * If the file in the index has any CR in it, do not convert. >> * This is the new safer autocrlf handling. >> + - unless we want to renormalize in a merge or cherry-pick > > Style nit, usually this line should begin with an aligned *? I think > it's not really that big a deal, though.
Yup, this is what I queued.
-- >8 -- From: Torsten Bögershausen <tboegi@web.de> Date: Wed, 30 Nov 2016 18:02:32 +0100 Subject: [PATCH] convert: git cherry-pick -Xrenormalize did not work
Working with a repo that used to be all CRLF. At some point it was changed to all LF, with `text=auto` in .gitattributes. Trying to cherry-pick a commit from before the switchover fails:
$ git cherry-pick -Xrenormalize <commit>
fatal: CRLF would be replaced by LF in [path]Commit 65237284 "unify the "auto" handling of CRLF" introduced a regression:
Whenever crlf_action is CRLF_TEXT_XXX and not CRLF_AUTO_XXX, SAFE_CRLF_RENORMALIZE was feed into check_safe_crlf(). This is wrong because here everything else than SAFE_CRLF_WARN is treated as SAFE_CRLF_FAIL.
Call check_safe_crlf() only if checksafe is SAFE_CRLF_WARN or SAFE_CRLF_FAIL.
Reported-by: Eevee (Lexy Munroe) <eevee@veekun.com> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- convert.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/convert.c b/convert.c index 077f5e601e..2f90f363c6 100644 --- a/convert.c +++ b/convert.c @@ -274,15 +274,16 @@ static int crlf_to_git(const char *path, const char *src, size_t len, if (convert_is_binary(len, &stats)) return 0; /* - * If the file in the index has any CR in it, do not convert. - * This is the new safer autocrlf handling. + * If the file in the index has any CR in it, do not + * convert. This is the new safer autocrlf handling, + * unless we want to renormalize in a merge or + * cherry-pick. */ - if (checksafe == SAFE_CRLF_RENORMALIZE) - checksafe = SAFE_CRLF_FALSE; - else if (has_cr_in_index(path)) + if ((checksafe != SAFE_CRLF_RENORMALIZE) && has_cr_in_index(path)) convert_crlf_into_lf = 0; } - if (checksafe && len) { + if ((checksafe == SAFE_CRLF_WARN || + (checksafe == SAFE_CRLF_FAIL)) && len) { struct text_stat new_stats; memcpy(&new_stats, &stats, sizeof(new_stats)); /* simulate "git add" */
-- 2.11.0-192-gbadfaabe38