author | Junio C Hamano <gitster@pobox.com> | |
Wed, 5 Aug 2009 03:31:59 +0000 (22:31 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 5 Aug 2009 19:14:00 +0000 (12:14 -0700) | ||
commit | c2ca1d79dbd54b06a05e5d14a897699e59dc9f9f | |
tree | 18b07e292194aeae75649206b4a5513f11676025 | tree | snapshot |
parent | 6a2d3f50f5a509fdfefca371c7178e36c0bcf7e9 | commit | diff |
Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
It is not that uncommon to have mails with DOS line-ending, notably
Thunderbird and web mailers like Gmail (when saving what they call
"original" message). So modify mailsplit to convert CRLF line-endings to
just LF.
Since git-rebase is built on top of git-am, add an option to mailsplit to
be used by git-am when it is acting on behalf of git-rebase, to refrain
from doing this conversion.
And add a test to make sure that rebase still works.
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
It is not that uncommon to have mails with DOS line-ending, notably
Thunderbird and web mailers like Gmail (when saving what they call
"original" message). So modify mailsplit to convert CRLF line-endings to
just LF.
Since git-rebase is built on top of git-am, add an option to mailsplit to
be used by git-am when it is acting on behalf of git-rebase, to refrain
from doing this conversion.
And add a test to make sure that rebase still works.
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-mailsplit.c | diff | blob | history | |
git-am.sh | diff | blob | history | |
t/t3400-rebase.sh | diff | blob | history |