> From: Matthew Johnson <mejoh...@gmail.com>
> 
> What differences does it display? It lists about a hundred .ogg files (like 
> the one I included) as 'modified'.

No, not what files are listed as different, but what are *the specific
differences* -- what does 'diff' show?  The way to see that you have
EOL problems is when diff flags *every single line* of the file as
having changed, despite that the text on the line is clearly the same.
(Sometimes the diff output will show the presence/absence of ^M at the
ends of lines, and sometimes it won't.  But diff programs always
notice when the EOLs are different in the two versions.)

But in your case...

> [mejohnsn@localhostThinkpad mr.ed]$ git status
> # On branch master
> # Changes not staged for commit:
> #   (use "git add <file>..." to update what will be committed)
> #   (use "git checkout -- <file>..." to discard changes in working 
> directory)
> #
> #       modified:   fix_ogg.py
> #       modified:   lesson1/images/home-icon.jpg
> #       modified:   lesson1/images/home-icon.png
> #       modified:   lesson1/images/left-arrow.png
> #       modified:   lesson1/images/right-arrow.png
> #       modified:   lesson2/images/home-icon.jpg
> #       modified:   lesson3/images/home-icon.jpg
> #       modified:   lesson3/lesson_a/images/home-icon.jpg
> #       modified:   lesson3/lesson_a/sounds/1.ogg
> #       modified:   lesson3/lesson_a/sounds/10.ogg
> ...

My guess is that this is a complete list of all the binary files
you're tracking.  If that's true, it strongly suggests that EOL
correction is working properly for text files, but that it's also
being applied to binary files, which is incorrect and causes
craziness.

The easiest fix would be to find someone who has a similar situation
but it's working, and then carefully compare your configuration
(regarding EOL normalization, binary/text classification, etc.) with
his, and understand what the difference is.

Dale

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to