I'll be sending a few patches that apply on top of applying these
two patches to show what I meant in my previous review comments.
The net change to apply.c, when you combine your 2/2 with these,
would become like the attached, which I think makes more sense.
Instead of queuing a squashed result,
From: Torsten Bögershausen
When a file had been commited with CRLF and core.autocrlf is true,
the following does not roundtrip, `git apply` fails:
printf "Added line\r\n" >>file &&
git diff >patch &&
git checkout -- . &&
git apply patch
Before applying the patch, the file from working tree is c
2 matches
Mail list logo