git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miklos Vajna <vmiklos@frugalware.org>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic()
Date: Tue, 12 Aug 2008 23:44:10 +0200	[thread overview]
Message-ID: <20080812214410.GG18960@genesis.frugalware.org> (raw)
In-Reply-To: <1218572040-23362-1-git-send-email-s-beyer@gmx.net>

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]

On Tue, Aug 12, 2008 at 10:13:59PM +0200, Stephan Beyer <s-beyer@gmx.net> wrote:
> merge_recursive_generic() takes, in comparison to to merge_recursive(),
> no commit ("struct commit *") arguments but SHA ids ("unsigned char *"),
> and no commit list of bases but an array of refs ("const char **").
> 
> This makes it more generic in the case that it can also take the SHA
> of a tree to merge trees without commits, for the bases, the head
> and the remote.
> 
> merge_recursive_generic() also handles locking and updating of the
> index, which is a common use case of merge_recursive().

Then what about adding an extra parameter to merge_recursive_generic()
so that merge_recursive_setup() could be a static function?

Or is there any reason to keep them separated?

Thanks.

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

  parent reply	other threads:[~2008-08-12 21:45 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-10 13:20 [PATCH 0/2] Avoid run_command() for recursive in builtin-merge Miklos Vajna
2008-08-10 13:20 ` [PATCH 1/2] merge-recursive: prepare merge_recursive() to be called from builtins Miklos Vajna
2008-08-10 13:20   ` [PATCH 2/2] builtin-merge: avoid run_command_v_opt() for recursive Miklos Vajna
2008-08-11 18:47     ` Junio C Hamano
2008-08-11 19:07       ` Miklos Vajna
2008-08-11 20:03         ` Junio C Hamano
2008-08-11 20:45           ` Miklos Vajna
2008-08-11 20:48             ` [PATCH] Add a new test to ensure merging a submodule is handled properly Miklos Vajna
2008-08-11 15:13   ` [PATCH 1/2] merge-recursive: prepare merge_recursive() to be called from builtins Stephan Beyer
2008-08-11 16:46     ` Miklos Vajna
2008-08-11 19:53     ` Junio C Hamano
2008-08-11 20:46       ` Stephan Beyer
2008-08-11 15:03 ` [PATCH] builtin-revert.c: Make use of merge_recursive() Stephan Beyer
2008-08-11 15:47   ` Johannes Schindelin
2008-08-11 19:01     ` Stephan Beyer
2008-08-11 19:09       ` Miklos Vajna
2008-08-11 21:44         ` [PATCH] builtin-revert: " Stephan Beyer
2008-08-11 21:46           ` Stephan Beyer
2008-08-11 22:33             ` Junio C Hamano
2008-08-11 23:27           ` Junio C Hamano
2008-08-11 23:47             ` Stephan Beyer
2008-08-11 23:52               ` Junio C Hamano
2008-08-12 16:45             ` [PATCH] Split out merge_recursive() to merge-recursive.c Miklos Vajna
2008-08-12 17:56               ` Stephan Beyer
2008-08-12 21:40                 ` Miklos Vajna
2008-08-12 20:13               ` [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic() Stephan Beyer
2008-08-12 20:14                 ` [PATCH (2)] Make builtin-revert.c use merge_recursive_generic() Stephan Beyer
2008-08-12 21:44                 ` Miklos Vajna [this message]
2008-08-13 17:26                   ` [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic() Stephan Beyer
2008-08-13 20:13                     ` Miklos Vajna
2008-08-13  3:17                 ` Daniel Barkalow
2008-08-13 17:29                   ` Stephan Beyer
2008-08-13 17:54                     ` Daniel Barkalow
2008-08-13 19:55                       ` Junio C Hamano
2008-08-13 20:05                         ` Stephan Beyer
2008-08-13 20:36                         ` Daniel Barkalow
2008-08-13 21:45                           ` Junio C Hamano
2008-08-14  3:17               ` [PATCH] Split out merge_recursive() to merge-recursive.c Junio C Hamano

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=20080812214410.GG18960@genesis.frugalware.org \
    --to=vmiklos@frugalware.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=s-beyer@gmx.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).