Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html