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-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.9 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,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id BAD9D1F910 for ; Thu, 3 Nov 2022 08:38:36 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="khBKItWk"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230370AbiKCIi3 (ORCPT ); Thu, 3 Nov 2022 04:38:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230292AbiKCIi2 (ORCPT ); Thu, 3 Nov 2022 04:38:28 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FCADB8 for ; Thu, 3 Nov 2022 01:38:21 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id f27so3350568eje.1 for ; Thu, 03 Nov 2022 01:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:in-reply-to:user-agent:references:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=DAxhhp6L3GdfAqe6QvwWsLqeuDk7hhchhaFo3GvRlX8=; b=khBKItWk2bOq7A2S/ba+mYieCokQmrkJkb3YTvYmsOA8tfPJG/rW1asR3AroyFrGCZ sMWE7BthfrClm/H270Si2xRtOH5nJLktTuCLvaHSMbm4wxo5I0UxSIfu/txbgSbVx+Qo aYvFxJlpkNQJETAwc7sk8x4YVAzSSE5UmdIvL8CZRsYvQr24HCuviGhjgB2KaatbCd0y Ua5Hyo54aUf7SLLegzRM5n9Lq06zqS+YlCbI3cbDYYeiNa/5Yj0TXVFNFDoZIknh6hwM 6K2ICRGXhj9G+1HfmQIr+Lyo7kj+iG4buRKRl02UIC7FfbvPd3Ev7fxucig1gnM9V+xf rQew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:in-reply-to:user-agent:references:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DAxhhp6L3GdfAqe6QvwWsLqeuDk7hhchhaFo3GvRlX8=; b=sWsyGT6yM2xvYOQLeJO62dkSO/sHCnhofkf7h7O6EXCMFVbxVAokpvjIhgBjcbnlpU vbyGrGrV4FPUQZ3VURJJxKeEJ9neYB8NMcvN/n9pJkQd4u+srjwIyQqeDrDNpo6+9FVI MS/3ct5LUJd9pvWVtKIu7oF8P+x+3qjCSjF+k/n8taqVM8SCZis2T/Ujg3HRV3WFQlEH wuGDARVNAzOQi8itr8m9M9K0YmQt/JHN9ny4+GsU25hM6BI3DVmwQnTBx7Xe8vzHOqSq tJhYoaMHn+usChlAsb+3fxJ3wrQdyup6Az8QcZfJZrEgfDmwF01Cz35anlgOvZ5Xk32z f81A== X-Gm-Message-State: ACrzQf0gv1p5cvIuULQFuXYaEdLOSZylY4MhCq2uU9xkoU/otPkzYnHj Sm+JO3a7TGUr3kxQdz/ciLf8XpoC0+w= X-Google-Smtp-Source: AMsMyM7q5Eb7Ro8GddqSIDfsggG7NiS9/WZVBhRk0NslBUizIP644f2tlkGhs3p0N3YR5pgZ3THAbw== X-Received: by 2002:a17:907:3f0c:b0:78e:2090:6924 with SMTP id hq12-20020a1709073f0c00b0078e20906924mr28515138ejc.332.1667464699593; Thu, 03 Nov 2022 01:38:19 -0700 (PDT) Received: from gmgdl (dhcp-077-248-183-071.chello.nl. [77.248.183.71]) by smtp.gmail.com with ESMTPSA id bg9-20020a170906a04900b007ae1e52805dsm205408ejb.103.2022.11.03.01.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 01:38:19 -0700 (PDT) Received: from avar by gmgdl with local (Exim 4.96) (envelope-from ) id 1oqVju-00CKKQ-0F; Thu, 03 Nov 2022 09:38:18 +0100 From: =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason To: Kyle Zhao via GitGitGadget Cc: git@vger.kernel.org, Elijah Newren , Taylor Blau , Kyle Zhao Subject: Re: [PATCH v5 1/2] merge-tree.c: add --merge-base= option Date: Thu, 03 Nov 2022 09:36:38 +0100 References: <01df0d1a6a7319beada3a3a94b8e36818be2a4d2.1667446182.git.gitgitgadget@gmail.com> User-agent: Debian GNU/Linux bookworm/sid; Emacs 27.1; mu4e 1.9.0 In-reply-to: <01df0d1a6a7319beada3a3a94b8e36818be2a4d2.1667446182.git.gitgitgadget@gmail.com> Message-ID: <221103.868rks301x.gmgdl@evledraar.gmail.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, Nov 03 2022, Kyle Zhao via GitGitGadget wrote: > From: Kyle Zhao > [...] > +test_expect_success 'specify merge-base as parent of branch2' ' > + # Setup > + git init base-b2-p && ( It's good practice to nuke it after the test: test_when_finished "rm -rf base-b2-p" && git init base-b2-p > + cd base-b2-p && > + test_commit c1 file1 && > + test_commit c2 file2 && > + test_commit c3 file3 > + ) && Could avoid the subshell-ing with: test_commit -C base-b2-p c1 file1 && [...] > + # Testing > + ( > + cd base-b2-p && > + TREE_OID=$(git merge-tree --write-tree --merge-base=c2 c1 c3) && Ditto sub-shell. > + > + q_to_tab <<-EOF >expect && > + 100644 blob $(git rev-parse c1:file1)Qfile1 > + 100644 blob $(git rev-parse c3:file3)Qfile3 > + EOF > + > + git ls-tree $TREE_OID >actual && > + test_cmp expect actual > + ) > +' > + > test_done