4

So I'm running git in Windows with a repo that runs on *nix, where git checks out Windows-style newlines (line ending CRLF) but commits *nix-style (LF), however I can't get a diff/apply to work without some fatal snag no matter what I've tried.

For example, I run a diff to a file from one commit to another like:

git diff commit1 commit2 > patch.diff

But when I run git apply patch.diff, I get errors like:

trailing whitespace patch failed patch does not apply

I've tried setting git config --global core.autocrlf true, tried git apply --ignore-space-change --ignore-whitespace patch.diff, and git config --global core.whitespace cr-at-eol, and even if it works, the apply shows that almost every line of code was changed just because of the newlines.

If I check the applied patch in something like Git GUI or WinMerge, it shows the proper changes just because they ignore newline changes, but either the diff or apply command is considering the newline differences, and everything I've found on the web to try just doesn't end up with a proper result.

I found something about git rm --cached -r . but it requires committing all files with "fixed" newlines... which isn't feasible for our project (and shouldn't be necessary).

Am I just not running the right combination or commands and options or what am I supposed to do?

Dave Heq
  • 356
  • 4
  • 18
  • What shell are you using when you run these git commands? You might want to check the diff file with `cat --show-all` and see just what whitespace is included in the file. Powershell for instance causes unicode files to be created following redirection – patthoyts Apr 27 '17 at 23:02
  • 1
    GIt 2.14.x/2.15 (Q3 2017) should improve this: see https://stackoverflow.com/a/46044063/6309 – VonC Sep 04 '17 at 21:14
  • I think we can close this good question as a duplicate now [how to avoid git-apply changing line endings](https://stackoverflow.com/questions/6308625/how-to-avoid-git-apply-changing-line-endings) – David Rawson Oct 26 '18 at 01:08

0 Answers0