git-apply can't apply patches to CRLF-files
- From
- Salikh Zakirov <salikh.zakirov@intel.com>
- Date
- May 26, 2006, 16:00 UTC
- Message-ID
- <4477262A.5000301@Intel.com>
Hello,
git-apply can't apply the patch to file with windows-style CRLF line endings, even if the patch was generated by git-format-patch.
Is this a bug or known deficiency?
The following script reproduces the problem --------- #!/bin/sh set -e mkdir trash cd trash git init-db echo "abc" > a unix2dos a git add a git commit -m "a added" a echo "cde" >> a unix2dos a git commit -m "a modified" a git format-patch HEAD^ git reset --hard HEAD^ git am 0001*.txt ---------
The resulting output is --------- $ ./test defaulting to local storage area a: done. Committing initial tree 357c56061b96c1548b15168bc0d02e8d1a319e0b a: done. 0001-a-modified.txt
Applying 'a modified'
error: patch failed: a:1 error: a: patch does not apply Patch failed at 0001. When you have resolved this problem run "git-am --resolved". If you would prefer to skip this patch, instead run "git-am --skip". ---------
If I remove unix2dos calls and so the file has normal unix LF line endings, then the result is correct as expected
--------- $ ./test defaulting to local storage area Committing initial tree 6afc8719a182fed19980da0e53d13fba1f94dd3f 0001-a-modified.txt
Applying 'a modified'
Wrote tree 49f5181a399bbcaac1da3bf693c466a281c4a255 Committed: 2b0a2936d0a65b3511882b8e88586ab054dd15b2 ---------