From: Michael P. <mic...@gm...> - 2010-12-07 23:58:58
|
Michael Plante wrote: >> Check this, though, again on Linux with autocrlf/safecrlf unspecified: >> >> $ git clone http://git.libusb.org/libusb-pbatard.git . >> $ git checkout -b prest pbr288 # pbr288 is the common ancestor >> $ git checkout -b pbst origin/supertest [1] (see below) >> $ hexdump -C libusb.dsw |less >> [...shows LF-only...] >> $ git checkout master >> $ git checkout pbst >> $ hexdump -C libusb.dsw |less >> [...shows CRLF...] If I insert: $ rm libusb.dsw $ git checkout libusb.dsw at [1], then the working copy is properly updated, and it shows CRLF-only on the following step. Moreover, "git status" still shows no changes. I'm not sure if this is a git bug, but it is sure as hell annoying. That said, I think that means eol=crlf works, provided wherever you switched from didn't have the setting set differently, or else at least didn't have the file in question present in the exact same directory. Note that I did NOT need to remove .git/index or issue a reset command in order to get this to work. Michael |