Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work
From: Junio C Hamano <hidden>
Date: 2016-12-01 18:27:44
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]
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) <redacted>
Signed-off-by: Torsten Bögershausen <redacted>
---I think the description and the code match with each other much better and the resulting code explains what is going on more clearly. Thanks---will queue.
quoted hunk
convert.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)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 */ - 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" */