From: Nicolas Sebrecht Date: Thu, 16 Jul 2009 04:05:23 GMT Subject: [PATCH v4] git-am: allow e-mail file(s) as input Message-ID: In-Reply-To: <7v7hy9bb8k.fsf@alter.siamese.dyndns.org> We traditionally allowed a mbox file or a directory name of a maildir to be given to "git am". Even though file in a maildir (or more generally, a piece of RFC2822 e-mail) is not a mbox file, it contains enough information to create a commit out of it, so there is no reason to reject one. This builds on top of a5a6755 (git-am foreign patch support: introduce patch_format, 2009-05-27) that introduced mailbox format detection. The codepath to deal with a mbox requires it to begin with "From " line and also allows it to begin with "From: ", but a random piece of e-mail can and often do begin with any valid RFC2822 header lines. Instead of checking the first line, we extract all the lines up to the first empty line, and make sure they look like e-mail headers. Signed-off-by: Nicolas Sebrecht --- Documentation/git-am.txt | 6 +++--- git-am.sh | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 32e689b..2a930a7 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -14,7 +14,7 @@ SYNOPSIS [--ignore-date] [--whitespace=