Re: [PATCH v1 1/1] convert: git cherry-pick -Xrenormalize did not work
From: Junio C Hamano <hidden>
Date: 2016-11-29 18:42:40
tboegi@web.de writes:
From: Torsten Bögershausen <redacted>
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]OK. That's a very clear description of the symptom that can be observed from the surface.
Whenever crlf_action is CRLF_TEXT_XXX and not CRLF_AUTO_XXX, SAFE_CRLF_RENORMALIZE must be turned into CRLF_SAFE_FALSE.
Aside from needing s/CRLF_SAFE/SAFE_CRLF/, this however lacks "Otherwise, because of X and Y, Z ends up doing W" to explain the "must be" part. Care to explain it a bit more? Thanks.
quoted hunk
Reported-by: Eevee (Lexy Munroe) <redacted> Signed-off-by: Torsten Bögershausen <redacted> --- Thanks for reporting. Here is a less invasive patch. Please let me know, if the patch is OK for you (email address, does it work..) convert.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)diff --git a/convert.c b/convert.c index be91358..526ec1d 100644 --- a/convert.c +++ b/convert.c@@ -286,7 +286,9 @@ static int crlf_to_git(const char *path, const char *src, size_t len, checksafe = SAFE_CRLF_FALSE; else if (has_cr_in_index(path)) convert_crlf_into_lf = 0; - } + } else if (checksafe == SAFE_CRLF_RENORMALIZE) + checksafe = SAFE_CRLF_FALSE; + if (checksafe && len) { struct text_stat new_stats; memcpy(&new_stats, &stats, sizeof(new_stats));