diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-04 22:31:59 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 12:14:00 -0700 |
| commit | c2ca1d79dbd54b06a05e5d14a897699e59dc9f9f (patch) | |
| tree | 18b07e292194aeae75649206b4a5513f11676025 /builtin-mailsplit.c | |
| parent | 6a2d3f50f5a509fdfefca371c7178e36c0bcf7e9 (diff) | |
| download | git-c2ca1d79dbd54b06a05e5d14a897699e59dc9f9f.tar.gz | |
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>
Diffstat (limited to 'builtin-mailsplit.c')
| -rw-r--r-- | builtin-mailsplit.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c index d288fde2c2..ee6ca0ebcd 100644 --- a/builtin-mailsplit.c +++ b/builtin-mailsplit.c @@ -44,6 +44,7 @@ static int is_from_line(const char *line, int len) } static struct strbuf buf = STRBUF_INIT; +static int keep_cr; /* Called with the first line (potentially partial) * already in buf[] -- normally that should begin with @@ -69,6 +70,12 @@ static int split_one(FILE *mbox, const char *name, int allow_bare) * "From " and having something that looks like a date format. */ for (;;) { + if (!keep_cr && buf.len > 1 && buf.buf[buf.len-1] == '\n' && + buf.buf[buf.len-2] == '\r') { + strbuf_setlen(&buf, buf.len-2); + strbuf_addch(&buf, '\n'); + } + if (fwrite(buf.buf, 1, buf.len, output) != buf.len) die_errno("cannot write output"); @@ -226,6 +233,8 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix) nr = strtol(arg+2, NULL, 10); } else if ( arg[1] == 'b' && !arg[2] ) { allow_bare = 1; + } else if (!strcmp(arg, "--keep-cr")) { + keep_cr = 1; } else if ( arg[1] == 'o' && arg[2] ) { dir = arg+2; } else if ( arg[1] == '-' && !arg[2] ) { |