From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nanako Shiraishi Subject: Re: [PATCH v6] mailinfo: allow e-mail files as input Date: Fri, 17 Jul 2009 19:06:01 +0900 Message-ID: <20090717190601.6117@nanako3.lavabit.com> References: <7v8wip9jjw.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: , Junio C Hamano , Stephen Boyd , Giuseppe Bilotta To: Nicolas Sebrecht X-From: git-owner@vger.kernel.org Fri Jul 17 12:06:50 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MRkL1-0001mQ-UP for gcvg-git-2@gmane.org; Fri, 17 Jul 2009 12:06:48 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934360AbZGQKGl (ORCPT ); Fri, 17 Jul 2009 06:06:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934354AbZGQKGk (ORCPT ); Fri, 17 Jul 2009 06:06:40 -0400 Received: from karen.lavabit.com ([72.249.41.33]:58731 "EHLO karen.lavabit.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934314AbZGQKGj (ORCPT ); Fri, 17 Jul 2009 06:06:39 -0400 Received: from b.earth.lavabit.com (b.earth.lavabit.com [192.168.111.11]) by karen.lavabit.com (Postfix) with ESMTP id ED73511B875; Fri, 17 Jul 2009 05:06:38 -0500 (CDT) Received: from 3939.lavabit.com (212.62.97.20) by lavabit.com with ESMTP id WOB0LNBBXVWP; Fri, 17 Jul 2009 05:06:38 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=lavabit; d=lavabit.com; b=fiAr/ELL220JUGmpyaMLhAWXKi4jE2bdxZYfggV6t2xDfAm8u6EiItaY6Cy7fPe6ClujwQlPbCFfHc0BGpryvbDJz5PvVovTCyPU9tPPeLm55TtnrMpRxWeaZg9U4SHZ/c67agUqm78JhWH5KJvOLHRygqVkSsWUIB8uCzv2UXI=; h=From:To:Cc:Subject:References:In-Reply-To:Date:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id; In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Quoting Nicolas Sebrecht : > We traditionally allowed a mbox file or a directory name of a maildir to be > given to "git am". Even though an individual 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. > It allows to run 'git am' with an email list argument, something like: > > $ git am dir/* > $ git am email1 email2 > > 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 > --- Could you summarize the changes since v5 here? Is the change the same as Junio's patch (if so shouldn't you credit him in the commit log message)? > Documentation/git-am.txt | 6 ++-- > git-am.sh | 14 ++++++++++++ > t/t4150-am.sh | 54 ++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 71 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=