From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Aug 2017 05:55:05 +0000 (-0700)
Subject: Merge branch 'tb/apply-with-crlf'
X-Git-Tag: v2.15.0-rc0~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a17483fcfe313e9ff5b9b0eb8245605fe7f66ea7;p=git

Merge branch 'tb/apply-with-crlf'

"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
---

a17483fcfe313e9ff5b9b0eb8245605fe7f66ea7