Git diff没有任何意义

Question

When I run git diff on a PHP file that I have modified, it shows me the wrong line being modified and the other lines are 'unmodified' (no changes), even though I have modified the other lines.

An example:

This is the change I have made to the document:

It only occurs on certain files and on other occasions, it will sometimes add the other lines, but it does not mark the appropriate line deletions. On other occasions, it will just append the changes at the end of the file, without marking it as an addition.

On SourceTree, it seems that the same diff does not make any sense too:

FYI: The files were originally downloaded from a Linux server.

Answer 1

I found the solution, after inspecting the offending files.

It seems that the files that were giving problems had a classic Macintosh CR only end of lines (EOLs) format. Contrast this to Window's CR+LF or UNIX's (and derivatives, including OS X) LF. Converting the file to Windows/UNIX EOL format, committing the fixed EOL files remedied the problem.

Testing it out with a test Git repository proved my suspicions right.

It might happen to be Git's way of tracking file changes, only supporting CR in combination with LF (CR+LF) and not CR alone (as what classic Mac uses).