[PATCH 0/2] Move call_depth and index_only to struct merge_options

[Miklos Vajna <vmiklos@frugalware.org>]

On Tue, Sep 02, 2008 at 01:02:31PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> I found it a bit disturbing that "index_only" and "call_depth" were
> not
> part of merge_options structure.

Here are two patches to do it, on top of current mv/merge-recursive.

Both patches are pretty trivial, I think, but I split them as the second
one is larger.

Now in some cases we have function calls like

merge_file(o, one, a, b, o->branch1, o->branch2);

but I don't think we can avoid it, as the last two parameters are not
always like this (two times are like this, and once conditionally
swapped). I'm not sure if it worth to introduce a new "int swap"
parameter, just to avoid the last two one.

Miklos Vajna (2):
  merge-recursive: move call_depth to struct merge_options
  merge-recursive: move index_only to struct merge_options

 merge-recursive.c |  164 ++++++++++++++++++++++++++---------------------------
 merge-recursive.h |   13 ++++
 2 files changed, 93 insertions(+), 84 deletions(-)