Elijah Newren <newren@xxxxxxxxx> writes:
> Hi,
>
> On Tue, Jan 9, 2018 at 11:19 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
>> > I haven't come up with an addition to the test suite, but I suspect
>> > this change is conceptually wrong. What if a call to this function
>> > is made during a recursive, inner merge?
>
> Eek, good catch.
>
>> merge-recursive.c | 2 +-
>> t/t3030-merge-recursive.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 51 insertions(+), 1 deletion(-)
>>
>> diff --git a/merge-recursive.c b/merge-recursive.c
>> index 780f81a8bd..0fc580d8ca 100644
>> --- a/merge-recursive.c
>> +++ b/merge-recursive.c
>> @@ -1954,7 +1954,7 @@ int merge_trees(struct merge_options *o,
>> if (oid_eq(&common->object.oid, &merge->object.oid)) {
>> struct strbuf sb = STRBUF_INIT;
>>
>> - if (index_has_changes(&sb)) {
>> + if (!o->call_depth && index_has_changes(&sb)) {
>> err(o, _("Dirty index: cannot merge (dirty: %s)"),
>> sb.buf);
>> return 0;
>
> Yep, looks good to me; sorry for overlooking this.
>
> Elijah
Thanks. The breakage is already in 'master' so this fix needs to be
fast-tracked.
