From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 02 Sep 2008 22:39:33 GMT
Subject: Re: [PATCH 0/2] Move call_depth and index_only to struct merge_options
Message-ID: <7vk5dui34q.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <cover.1220392547.git.vmiklos@frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

> 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.

I suspected that it always holds that "index_only === !!call_depth".

Shouldn't strbuf obuf be part of the merge_options structure that
describes the current call status?