diff options
| author | Torsten Bögershausen <tboegi@web.de> | 2016-11-30 18:02:32 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-01 11:27:08 -0800 |
| commit | 1c25d2d8ed4c5154c9059918e20e75cda3bede81 (patch) | |
| tree | ad6d581bab6c83858991dc546f68ad9b2418f82c /Documentation/pull-fetch-param.txt | |
| parent | b365dafe2360c12353259432a2940c6123cd2b52 (diff) | |
| download | git-1c25d2d8ed4c5154c9059918e20e75cda3bede81.tar.gz | |
convert: git cherry-pick -Xrenormalize did not workjc/renormalize-merge-kill-safer-crlf
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>
Diffstat (limited to 'Documentation/pull-fetch-param.txt')
0 files changed, 0 insertions, 0 deletions