Re: [PATCH 1/1] diffcore: add a filter to find a specific blob

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 8, 2017, 17:21 UTC
Message-ID: <xmqqbmj99lul.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <xmqq1sk5b6rx.fsf@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 15 quoted lines

> Stefan Beller <sbeller@google.com> writes:
> ...
>> @@ -2883,6 +2884,8 @@ int prepare_revision_walk(struct rev_info *revs)
>>  		simplify_merges(revs);
>>  	if (revs->children.name)
>>  		set_children(revs);
>> +	if (revs->diffopt.blobfind)
>> +		revs->simplify_history = 0;
>>  	return 0;
>>  }
>
> It makes sense to clear this bit by default, but is this an
> unconditonal clearing?  In other words, is there a way for the user
> to countermand this default and ask for merge simplification from
> the command line, e.g. "diff --simplify-history --blobfind=<blob>"?

Looking at the places that assign to revs->simplify_history in revision.c it seems that "this option turns the merge simplification off unconditionally" is pretty much the norm, and this change just follows suit. So perhaps it is OK to let this pass, at least for now.