From: "Shawn O. Pearce" <spearce@spearce.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [PATCH] Make git-revert & git-cherry-pick a builtin
Date: Thu, 1 Mar 2007 16:51:23 -0500 [thread overview]
Message-ID: <20070301215123.GB9254@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.63.0703012230290.22628@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > > +static int merge_recursive(const char *base_sha1,
> > > + const char *head_sha1, const char *head_name,
> > > + const char *next_sha1, const char *next_name)
> > > +{
> > > + ...
> > > +}
> >
> > Somehow I would have expected you to call merge-recursive not spawn, but
> > this is saner ;-).
>
> I briefly considered this, until I realized that merge-recursive is no
> builtin yet!
Heh, I expected the same thing as Junio when I first read through
the patch. But then I realized that doing so right now might not
be a great idea; normally if merge-recursive aborts we say "fix up
and commit" and do a few things still in cherry-pick/revert before
giving the shell back to the user.
But a quick pass through merge-recursive.c says this may actually
be possible...
> Speaking of this issue: Would it be conceivable to make the standalones
> into builtins? (This adds a dependency on libcurl to core Git programs,
> but I could live with that... It would make a builtin fetch easier, too.)
Please don't make libcurl required. I don't build with it on
Solaris, because its not there, and I don't need it there.
--
Shawn.
next prev parent reply other threads:[~2007-03-01 21:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-01 4:26 [PATCH] Make git-revert & git-cherry-pick a builtin Johannes Schindelin
2007-03-01 11:51 ` Junio C Hamano
2007-03-01 21:37 ` Johannes Schindelin
2007-03-01 21:51 ` Shawn O. Pearce [this message]
2007-03-01 22:24 ` Johannes Schindelin
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=20070301215123.GB9254@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).