]> git.ipfire.org Git - thirdparty/git.git/commit - convert.c
convert: git cherry-pick -Xrenormalize did not work
authorTorsten Bögershausen <tboegi@web.de>
Wed, 30 Nov 2016 17:02:32 +0000 (18:02 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Dec 2016 19:27:08 +0000 (11:27 -0800)
commit1c25d2d8ed4c5154c9059918e20e75cda3bede81
treead6d581bab6c83858991dc546f68ad9b2418f82c
parentb365dafe2360c12353259432a2940c6123cd2b52
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