diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-27 05:55:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-27 05:55:05 (GMT) |
| commit | a17483fcfe313e9ff5b9b0eb8245605fe7f66ea7 (patch) | |
| tree | b90b9eaa13cdcf37d65b8dde1fd715603ece0118 /contrib/coccinelle/array.cocci | |
| parent | f6a47f9b7aa5ad472495c475d61f8a4b97f7b6b6 (diff) | |
| parent | c24f3abaceabb590125751a67ec0e32946780ac7 (diff) | |
| download | git-a17483fcfe313e9ff5b9b0eb8245605fe7f66ea7.zip git-a17483fcfe313e9ff5b9b0eb8245605fe7f66ea7.tar.gz git-a17483fcfe313e9ff5b9b0eb8245605fe7f66ea7.tar.bz2 | |
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
Diffstat (limited to 'contrib/coccinelle/array.cocci')
0 files changed, 0 insertions, 0 deletions