From mboxrd@z Thu Jan 1 00:00:00 1970 From: "J. Bruce Fields" Subject: Re: Let me ask again: How do we import patches from non-git sources? Date: Wed, 6 Jun 2007 13:54:58 -0400 Message-ID: <20070606175458.GH12774@fieldses.org> References: <1180017010.21181.2.camel@zealous.synapsedev.com> <1181151454.6086.23.camel@zealous.synapsedev.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git To: Marc Singer X-From: git-owner@vger.kernel.org Wed Jun 06 19:55:48 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HvzjU-0004E1-5o for gcvg-git@gmane.org; Wed, 06 Jun 2007 19:55:44 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756600AbXFFRzB (ORCPT ); Wed, 6 Jun 2007 13:55:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759579AbXFFRzA (ORCPT ); Wed, 6 Jun 2007 13:55:00 -0400 Received: from mail.fieldses.org ([66.93.2.214]:41715 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756600AbXFFRzA (ORCPT ); Wed, 6 Jun 2007 13:55:00 -0400 Received: from bfields by fieldses.org with local (Exim 4.67) (envelope-from ) id 1Hvzik-0004yc-GY; Wed, 06 Jun 2007 13:54:58 -0400 Content-Disposition: inline In-Reply-To: <1181151454.6086.23.camel@zealous.synapsedev.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Wed, Jun 06, 2007 at 10:37:34AM -0700, Marc Singer wrote: > On Thu, 2007-05-24 at 07:30 -0700, Marc Singer wrote: > > It looks like it reduces to something very simple. > > > > Git patches, as generated by git-format-patch, have a header with an > > email address. > > > > Cogito patches, as generated by cg-mkpatch, have no email address in the > > header. > > > > git-am doesn't like the cogito patches. > > > > Is there a way to import patches that did not come from git? Remember > > that we'd like to include the functionality of git-am that adds new > > files to the index. > > > > Cheers. > > I have patches from another source as well and I'd like to be able to > import them even though these aren't from git. Based on my notes from the last time I needed to feed a bunch of non-mbox, non-git-produced patches into git-am, the hard part was figuring out how it split a file into separate messages; my notes say: "Finds lines begining with "From " and ending with "hh:mm:ss yyyy". See builtin-mailsplit code for more details." Other than that, I think it just needs and From: and Subject: lines to get author and first-line of the commit. the git-am man page has some documentation of this. It could probably use more. --b.