On 10/2/2020 2:51 PM, Junio C Hamano wrote: > "Derrick Stolee via GitGitGadget" <gitgitgadget@xxxxxxxxx> 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@xxxxxx> >> Reported-by: Srinidhi Kaushik <shrinidhi.kaushik@xxxxxxxxx> >> Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> > > 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. >> 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
