git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Marc Singer <elf@synapse.com>
Cc: git <git@vger.kernel.org>
Subject: Re: Let me ask again: How do we import patches from non-git sources?
Date: Wed, 6 Jun 2007 13:54:58 -0400	[thread overview]
Message-ID: <20070606175458.GH12774@fieldses.org> (raw)
In-Reply-To: <1181151454.6086.23.camel@zealous.synapsedev.com>

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.

  reply	other threads:[~2007-06-06 17:55 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-24 14:30 How do we import patches from non-git sources? Marc Singer
2007-05-24 15:29 ` Johannes Schindelin
2007-05-24 21:22 ` Yann Dirson
2007-05-25 11:24   ` Jakub Narebski
2007-05-24 21:45 ` Linus Torvalds
2007-06-06 17:37 ` Let me ask again: " Marc Singer
2007-06-06 17:54   ` J. Bruce Fields [this message]
2007-06-12 16:27     ` Marc Singer
2007-06-12 18:13       ` J. Bruce Fields
2007-06-14  1:45         ` Marc Singer
2007-06-06 17:58   ` Matthieu Moy
2007-06-06 18:18     ` Jon Loeliger
2007-06-14  1:49       ` Marc Singer
2007-06-14  7:53         ` Matthieu Moy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070606175458.GH12774@fieldses.org \
    --to=bfields@fieldses.org \
    --cc=elf@synapse.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).