Re: [PATCH 2/3] git diff: improve A...B merge-base handling

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 12, 2020, 17:06 UTC
Message-ID: <xmqq8sgs2ozk.fsf@gitster.c.googlers.com>
In-Reply-To: <6eadaa89-fde7-4224-dcb9-ceef315942f2@iee.email>

Philip Oakley <philipoakley@iee.email> writes:

Show 24 quoted lines

> On 09/06/2020 01:03, Chris Torek via GitGitGadget wrote:
> [snip]
>> +test_description='behavior of diff with symmetric-diff setups'
>> +
>> +. ./test-lib.sh
>> +
>> +# build these situations:
>> +#  - normal merge with one merge base (b1...b2);
>> +#  - criss-cross merge ie 2 merge bases (b1...master);
>> +#  - disjoint subgraph (orphan branch, b3...master).
>
> nit:
> Use of b1, b2, b3 here, but br1, br2, br3 below
>> +#
>> +#     B---E   <-- master
>> +#    / \ /
>> +#   A   X
>> +#    \ / \
>> +#     C---D--G   <-- br1
>> +#      \    /
>> +#       ---F   <-- br2
>> +#
>> +#  H  <-- br3
>> +#

True. Which one is to be recommended? The shorter and sweeter b1, b2 and b3?

In any case, that must match the topology used by the tests.

Thanks.