From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 6D9BC1F4B4 for ; Fri, 2 Oct 2020 19:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725648AbgJBTra (ORCPT ); Fri, 2 Oct 2020 15:47:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725283AbgJBTra (ORCPT ); Fri, 2 Oct 2020 15:47:30 -0400 Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68B71C0613D0 for ; Fri, 2 Oct 2020 12:47:30 -0700 (PDT) Received: by mail-ot1-x342.google.com with SMTP id 60so2552910otw.3 for ; Fri, 02 Oct 2020 12:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=ytKddrESa5PINK63F2heyYrgxkL4pC3XwHUQwJin1mc=; b=PdTOVqHOZ0wO7k54cNu4x+oQdTjwAx5CsNpxVzu0di53BXuTARLeHRjupaGnsmzkJM r6qf6zTf19oYMNPkI8/Ajx+5via0SVS9xMf+kG2ExTQ2AzuVDVGOUumN3VNRiw21O3Tx y3sj4xwv4iexn5okiQma3nyP8tclEqMRpRq7JDnjLf8aopgKTDVCsZVEYCc/s9pgY7k9 O5KCaGC2MSUs3OxgHOyGX387ULIdSntIcTPZ0fB0s0+wod1mrkrfsWgPTqorEc9VGEwz SoFSU6o6+SM3m1x6/P7216hdBP/RCZ1hlQhm2JGdYRS1FqyoNEYW4TBErdI711mfsrum wzYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ytKddrESa5PINK63F2heyYrgxkL4pC3XwHUQwJin1mc=; b=P+D2k0N6hjfX9EObr1G3fJgU6A0stKCufT5LSLsZg/18kAUlBW9am5Gxu/15wa2zuR 2shtwsijSeQZ9YkTcxNQ03UXZOXLSjEKAyPzZkJjMjrC9d39jCW+B9ayL/663NWVcH3r d2S20Q1YRG9q6U/EpJEmnSbiNk1nry84ckVUPVeZwMipMeAuNwganN37EAMAjeSDt4Ee 5TubYi+14DMieteRtjz7tHIh0LbwUnbwsl92t3A5rIt9KXjCFL1euTITFq8mCwjIqrU5 65GgmqNILWEamTm9crgsk7vgBFDAc9CvReIbgraXVzutjH3T8lrnzrdiMcj46DfuhjS7 pcyw== X-Gm-Message-State: AOAM5313fmiUhtzsRjVLW3IG+D8gsNd8PrxLtHwtSsv7Y6JPNVRttrK/ yCz+6ZxJKJfZ8RIALdYu4IU= X-Google-Smtp-Source: ABdhPJwSNc9JoX35yJz7qBZhnMZ/lQwOJDZQdwJ8b9qoQebIFWGRq377USwjpPV2j/mLMRgiTCdN9A== X-Received: by 2002:a05:6830:2436:: with SMTP id k22mr1360479ots.185.1601668049612; Fri, 02 Oct 2020 12:47:29 -0700 (PDT) Received: from ?IPv6:2600:1700:e72:80a0:bd7f:7189:ff7:ce98? ([2600:1700:e72:80a0:bd7f:7189:ff7:ce98]) by smtp.gmail.com with UTF8SMTPSA id l15sm483624oil.24.2020.10.02.12.47.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Oct 2020 12:47:29 -0700 (PDT) Subject: Re: [PATCH] commit-reach: fix in_merge_bases_many bug To: Junio C Hamano , Derrick Stolee via GitGitGadget , Srinidhi Kaushik Cc: git@vger.kernel.org, Derrick Stolee , Derrick Stolee References: From: Derrick Stolee Message-ID: Date: Fri, 2 Oct 2020 15:47:28 -0400 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Thunderbird/82.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 10/2/2020 2:51 PM, Junio C Hamano wrote: > "Derrick Stolee via GitGitGadget" writes: > >> The fix itself is to swap min_generation with a max_generation in >> repo_in_merge_bases_many(). >> >> Helped-by: Johannes Schindelin >> Reported-by: Srinidhi Kaushik >> Signed-off-by: Derrick Stolee > > 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