diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:05 -0700 |
| commit | a17483fcfe313e9ff5b9b0eb8245605fe7f66ea7 (patch) | |
| tree | b90b9eaa13cdcf37d65b8dde1fd715603ece0118 /mergetools/araxis | |
| parent | Merge branch 'jt/stash-tests' (diff) | |
| parent | apply: file commited with CRLF should roundtrip diff and apply (diff) | |
| download | tgif-a17483fcfe313e9ff5b9b0eb8245605fe7f66ea7.tar.xz | |
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 'mergetools/araxis')
0 files changed, 0 insertions, 0 deletions