diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 08:02:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 08:02:55 (GMT) |
| commit | 648a50a08ad3d6718899a30a438ff97b4bdda342 (patch) | |
| tree | bdae2506cdf6e746359bd14473c86b16b7d67165 /mergesort.c | |
| parent | 27015b4f95cddd51172a8b12a05fd68f4477bdfb (diff) | |
| parent | c24f3abaceabb590125751a67ec0e32946780ac7 (diff) | |
| download | git-648a50a08ad3d6718899a30a438ff97b4bdda342.zip git-648a50a08ad3d6718899a30a438ff97b4bdda342.tar.gz git-648a50a08ad3d6718899a30a438ff97b4bdda342.tar.bz2 | |
Merge branch 'tb/apply-with-crlf' into maint
"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
Diffstat (limited to 'mergesort.c')
0 files changed, 0 insertions, 0 deletions