From: Junio C Hamano Date: Tue, 22 Aug 2017 17:36:59 +0000 (-0700) Subject: Merge branch 'tb/apply-with-crlf' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f92bf670614d7e53d95c9bb990450c6cdfbb77bc?hp=--cc Merge branch 'tb/apply-with-crlf' into next "git apply" that is used as a better "patch -p1" failed to apply a taken from a file with CRLF line endings to a file with CRLF line endings. The root cause was because it misused convert_to_git() that tried to do "safe-crlf" processing by looking at the index entry at the same path, which is a nonsense---in that mode, "apply" is not working on the data in (or derived from) the index at all. This has been fixed. * tb/apply-with-crlf: apply: file commited with CRLF should roundtrip diff and apply convert: add SAFE_CRLF_KEEP_CRLF --- f92bf670614d7e53d95c9bb990450c6cdfbb77bc