Re: [PATCH] commit-reach: fix in_merge_bases_many bug

From: Derrick Stolee <stolee@gmail.com>
Date: Oct 2, 2020, 19:47 UTC
Message-ID: <c6b163dd-d5f4-73a8-43ac-22460d1079ec@gmail.com>
In-Reply-To: <xmqqv9fs8nre.fsf@gitster.c.googlers.com>

On 10/2/2020 2:51 PM, Junio C Hamano wrote:

Show 12 quoted lines

> "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 
>> The fix itself is to swap min_generation with a max_generation in
>> repo_in_merge_bases_many().
>>
>> Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>> Reported-by: Srinidhi Kaushik <shrinidhi.kaushik@gmail.com>
>> Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
> 
> The order of these looked iffy so I rearranged them in chrono order,
> Srinidhi's series found it broken, and with Dscho's help, fix was
> produced and you sent it with your sign off.

Sure. I can agree with that chronological order and will keep that in mind for next time.

Show 11 quoted lines

>>  commit-reach.c        |  8 ++++----
>>  t/helper/test-reach.c |  2 ++
>>  t/t6600-test-reach.sh | 30 ++++++++++++++++++++++++++++++
>>  3 files changed, 36 insertions(+), 4 deletions(-)
> 
> I've applied this and then rebased Srinidhi's latest on top, with
> the following to re-enable the commit-graph in the codepath.  t5533
> and t6600 passes and when the fix in the message I am responding to
> is reverted, t5533 again fails.
> 
> Thanks.

Thanks for double-checking. I also think that dropping the "hide the error" patch is prudent.

Thanks, -Stolee