git-am and CRLF
- From
Erik Faye-Lund <kusmabite@gmail.com>
- Date
- Mar 13, 2013, 16:54 UTC
- Message-ID
- <CABPQNSb9euNgCY9g617opThHC8OUpZQvJ+peor8Yk39LZ+y+TQ@mail.gmail.com>
I recently tried to apply a patch-series to a repo that is unfortunately full of CRLF files, and was a bit surprised that it didn't work at all.
So I made a small repro-case, and it seems CRLF new-lines is indeed the problem. Any clue how to fix it? The way I see it, we should simply be able top treat the CR as any other character, and succeed. But that doesn't seem to happen...
git init test &&
(
cd test/ &&
git config core.autocrlf false &&
printf "%s\r\n%s\r\n" "foo" "bar" > test.txt &&
git add test.txt &&
git commit -m. &&
printf "%s\r\n%s\r\n%s\r\n" "foo" "baz" "bar" > test.txt &&
git commit -am. &&
git format-patch -1 &&
git reset --hard HEAD^ &&
git am 0001-.patch
)