From patchwork Thu Jul 22 21:28:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12394833 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 678A0C4320A for ; Thu, 22 Jul 2021 21:28:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4DB6160C41 for ; Thu, 22 Jul 2021 21:28:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231706AbhGVUsR (ORCPT ); Thu, 22 Jul 2021 16:48:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231594AbhGVUsQ (ORCPT ); Thu, 22 Jul 2021 16:48:16 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83E9DC061757 for ; Thu, 22 Jul 2021 14:28:50 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id w12so120129wro.13 for ; Thu, 22 Jul 2021 14:28:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=+LQv9W/8FyW4BLvhS//TTXSTF5vhzAh80O5f8juX6TU=; b=TMhlp8KPo0P5vwJ640dczcGZx8YQVjGs8pvjmwih+KLt8e61MHztwBDZTBzeTHobVI 0ufb5fBAhZuFoUOZLF9Rooo/MKmqiUqnE3meW85kwwm0XSo79LSkCKJuA9Isb+k5Xmr/ TxR17prtIYxoS939zCkIEzHafN4Ca4ET10PI/NeBFHD0wHQPIWi77GW9Qz+GBGt8S9JB ny//2pbeLb3uoJlznxrg9hgyPhapywGZRxm+Z46EdYmt9MUx0ftO9J3ef4iOQmsqXwfs lJFDpWcqJ8Q9ADMxTNn4PHjFPnJ8UkTqMPJESA7zPOpMugg2eqRNMrOUuqHNYDSNuytA lTyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=+LQv9W/8FyW4BLvhS//TTXSTF5vhzAh80O5f8juX6TU=; b=Tg2Z/JiCB0ne8IfYIE6Py8GGakfHiju1/A1jnzQNQXlrIldrTU2LhpzJsNE0x/jCDA B4A7NgXjn/qxx0jcZxT52x0+N6dsVi6qZA68s7ir/uQc26F3Da26glvmGHcQTpwiemZk ZG06N8BeFZ9Yh3Xv/HRJpiVEQJrrYF+hIWwFY49lJfHJ9OeDn6srsA0NTSe/Q5o76lkW uWr8YTQgEqV8NrywJkjOcy21ZNGtRI8NN7J+hDyg2VlzA6I8o3nZYdgHmPh18HB/9eVI vZUQaiycmBxkWcK52ZDAzUQNWw7gec5ZWRcziJgxJRAke/mPEhZjpzNNBVVGBQSdI2C8 WOEw== X-Gm-Message-State: AOAM532JljCxyCHZiZB3GLqSK2hGftpWlfL9fwuUltMKDLy+RbXC1Baf RV+r9vxjmmb/2Y4i9u1/WGUntePHFWk= X-Google-Smtp-Source: ABdhPJxAHyt0PxxED99AtMZoaFGP+Z7qbkg2FBL1hzRWuYIvoZo8CyK3q3i0jrym9otsrAi35wBuFQ== X-Received: by 2002:a5d:6ac8:: with SMTP id u8mr1997374wrw.30.1626989329185; Thu, 22 Jul 2021 14:28:49 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l2sm23714664wms.21.2021.07.22.14.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:48 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:37 +0000 Subject: [PATCH v2 01/11] t6050: use git-update-ref rather than filesystem access Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys Signed-off-by: Han-Wen Nienhuys --- t/t6050-replace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index e33d512ec11..2500acc2ef8 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -132,7 +132,7 @@ tagger T A Gger <> 0 +0000 EOF test_expect_success 'tag replaced commit' ' - git mktag .git/refs/tags/mytag + git update-ref refs/tags/mytag $(git mktag X-Patchwork-Id: 12394837 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13303C4338F for ; Thu, 22 Jul 2021 21:28:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F338160C41 for ; Thu, 22 Jul 2021 21:28:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231797AbhGVUsT (ORCPT ); Thu, 22 Jul 2021 16:48:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231613AbhGVUsR (ORCPT ); Thu, 22 Jul 2021 16:48:17 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24C5DC061575 for ; Thu, 22 Jul 2021 14:28:51 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id o1so196022wrp.5 for ; Thu, 22 Jul 2021 14:28:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=dkjFbKCqgkmzb3ALYM/j8lsueduBg9xjD6SXKLT3gIk=; b=qgGi3DanEp/0KDz0WpoW7T1Tu4IfGM15/U0ICKejM6Gy9o8RSkcA4TbYc9ZrWbC6hT hLRwVw9QrR5UsXMwE0SebEk6uhUhnzTnM+wg/hQS2PLAJWL5omr3h6Mq+PguhQxdzRqu eeQ7EkczQB5Yr3Wd2duQvUsJVW76ASs5vKMbua8aJQNcNTxUosJdyzvfIBi3Fv6FLo9s kIGshJKBeiuo24FHuGFjPDNmHE3jh+Qv5V4P6rBmCNR/V3sQ6kZXj+FKDDPbZj8g+lHK Vzgh7/VaTRK6u/4yP0XvGnduFY9wmnKDSKqFddiy+Traf5cO1sgPj2D08pnQEIpMwLvj SBMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=dkjFbKCqgkmzb3ALYM/j8lsueduBg9xjD6SXKLT3gIk=; b=EpFn6iQEgdx4MHe19o9H4zctS+yzjwjIKyhrVHD1nAE4FKhpPo85hhMowXwOdNovpT tc/K5TDSeQMNowjHKNvWixPL207fCSFBsu4vBHtxojafImzAHxRcXIKrfwevbOYmK2mG cO7f589K4nT4pdbWFWTrwjwmBXCOpz3AVRiIrVDi6zc8GgRBXUMBYztMOf2w01jla6SF GPDisIneoeWyicQX4wJ/igh9DMap9MXjXuY2cBUkYUpTw6kDinD1CMMZ2EVcZagOpY1z QqLozW76mwojaLrRJQMG8MGv8tflct1iZCXEgOKwVsOoV8WPpDl8fwxngyepJq+Q/wyG fkhw== X-Gm-Message-State: AOAM5306Fa5PH+aG9E7rloGKkOAciMaLZR6JOnfteqzLdXDYNDRITjlJ W2IkWu6nXpvx3b4rhNw59+H7kwQFmnc= X-Google-Smtp-Source: ABdhPJwU/AWVB01UW95L9btykDFy8n2BiVOkPHAHnSAOrda7P3F1vHgtp9FRwgUwkWhh6KW10FmNQg== X-Received: by 2002:a5d:59ae:: with SMTP id p14mr1983949wrr.148.1626989329753; Thu, 22 Jul 2021 14:28:49 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b12sm31409234wro.1.2021.07.22.14.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:49 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:38 +0000 Subject: [PATCH v2 02/11] t1503: mark symlink test as REFFILES Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys Signed-off-by: Han-Wen Nienhuys --- t/t1503-rev-parse-verify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh index bf081023917..40958615ebb 100755 --- a/t/t1503-rev-parse-verify.sh +++ b/t/t1503-rev-parse-verify.sh @@ -142,7 +142,7 @@ test_expect_success 'main@{n} for various n' ' test_must_fail git rev-parse --verify main@{$Np1} ' -test_expect_success SYMLINKS 'ref resolution not confused by broken symlinks' ' +test_expect_success SYMLINKS,REFFILES 'ref resolution not confused by broken symlinks' ' ln -s does-not-exist .git/refs/heads/broken && test_must_fail git rev-parse --verify broken ' From patchwork Thu Jul 22 21:28:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12394835 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBB1DC432BE for ; Thu, 22 Jul 2021 21:28:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE12A60EB5 for ; Thu, 22 Jul 2021 21:28:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231719AbhGVUsS (ORCPT ); Thu, 22 Jul 2021 16:48:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231607AbhGVUsR (ORCPT ); Thu, 22 Jul 2021 16:48:17 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A36F8C06175F for ; Thu, 22 Jul 2021 14:28:51 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id h24-20020a1ccc180000b029022e0571d1a0so420897wmb.5 for ; Thu, 22 Jul 2021 14:28:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=o9KVw4pEzNFeWgplGe9YGi9/mdHySu7RVQZAxi7KePI=; b=OkTuzmvr1s5YddGvtfi2boC4KK3b0BOIqzMJFw27Q8SVl4rb/rGMK8UI+Vx5zZOcsw 5u/defwPXtatAKqXaC1f91iRpdmk6KNR6YZOdvAp5yJngeFzpFF4hVUYg/cLomR3cLFS G8wDi1D6BeLZxVzafqZrJWdHVvpdVujdh7Gy4Jzi/dZ/16ppt4AAh55c+BxuzkRFXXwO DlsaL2t4TEh/Q/VmR2N+RuPK+YxeQm7iMz546DKJdDK62Fq3nkWBN/PgFBGWZkypsqa5 dz8AemT314lMwXcnkvCh0cyzP/7HHMGWwbKyFAVz3oq3pIbMPUVU7Ie5L4Y134KH7SDa AxaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=o9KVw4pEzNFeWgplGe9YGi9/mdHySu7RVQZAxi7KePI=; b=EGEhO2ZfmMmkEhKY7onlj8vNcu5Zi1C1itOO9XTv7L1AoMsNy7f+bE6SpAe/iWqNe2 WXkBdy62Un5d3KnX3aPM/FmLdq388Xnthr7j3Op3Rt8dx3WkP76QspbRbmvkl38VTrd3 8sNEbigKMq9tlxVwFoy4l80bgh8/K83SJAvy2er6ZC1Dqx2nzjo+wjvc+htf1+pxwY9E Mwdl+B2wHheNcl2INvAhWctJ1tcOiVioxRGtClFSA/BEtZUvwYswKriEzA0ML4xyjqgZ Xbyv110esGRhHKyf5NGI0LT8aLf3jVskMQ936q4qkxdfU0zgGg7Nqgz8Zp8VlzyMjAnq ZRnA== X-Gm-Message-State: AOAM530fF94Bxo3Y0sv00upsnYTru3zg6P0An70gmhEpAP9CQWuRfQn0 K+FcrrMN9F1o6+4BHl+ytkO4N2c93qU= X-Google-Smtp-Source: ABdhPJyKAzYqdGOiqxXZL58FZdctyHRGiIMmg7Zjm8kSlJ7fI/Nl9lnF8iYDlqzaDjmOBRa+WJoKKQ== X-Received: by 2002:a05:600c:4c11:: with SMTP id d17mr11103779wmp.121.1626989330346; Thu, 22 Jul 2021 14:28:50 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e8sm9778121wrc.6.2021.07.22.14.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:50 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:39 +0000 Subject: [PATCH v2 03/11] t6120: use git-update-ref rather than filesystem access Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys Signed-off-by: Han-Wen Nienhuys --- t/t6120-describe.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 1a501ee09e1..bae2419150b 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -107,7 +107,8 @@ test_expect_success 'describe --contains defaults to HEAD without commit-ish' ' check_describe tags/A --all A^0 test_expect_success 'renaming tag A to Q locally produces a warning' " - mv .git/refs/tags/A .git/refs/tags/Q && + git update-ref refs/tags/Q $(git rev-parse refs/tags/A) && + git update-ref -d refs/tags/A && git describe HEAD 2>err >out && cat >expected <<-\EOF && warning: tag 'Q' is externally known as 'A' @@ -135,7 +136,8 @@ test_expect_success 'abbrev=0 will not break misplaced tag (2)' ' ' test_expect_success 'rename tag Q back to A' ' - mv .git/refs/tags/Q .git/refs/tags/A + git update-ref refs/tags/A $(git rev-parse refs/tags/Q) && + git update-ref -d refs/tags/Q ' test_expect_success 'pack tag refs' 'git pack-refs' From patchwork Thu Jul 22 21:28:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12394841 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F119CC432BE for ; Thu, 22 Jul 2021 21:29:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D667C60EB5 for ; Thu, 22 Jul 2021 21:29:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231816AbhGVUsY (ORCPT ); Thu, 22 Jul 2021 16:48:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231607AbhGVUsS (ORCPT ); Thu, 22 Jul 2021 16:48:18 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 396E9C061757 for ; Thu, 22 Jul 2021 14:28:52 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id g15so212827wrd.3 for ; Thu, 22 Jul 2021 14:28:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=h6uXKl0tUCfl08p2NwWTeTQTNvBkftMiBGuKvpgJW90=; b=aNpMjbB3bt4ft5RouqSpeKaiidbZx+SWIJWNxOJeFz29/FSkJ7GzRF5DjzO8ahxhSd jbOs4BLRhiDIKAPKhdI/5JZ7hu01idkpll5LAcIWYYZfbY2iU0q4lXqfxZZCI6kJ4e26 UoGkHwyCIfdjIEHWNrZSDFDbL5r7f/emVL/8h9gA3qkQqcG1H3tcFNg4ZcArDQO/pyiv 54TmI1UhNfxE23c2vZ3K9c7TI6F/QZR51x1UwtwgX7/kwy50Mq8bYzF/0rcLbIuqow0T rbfI0BoQPsqiD6DsqgGzjVNdOAoYgICu1BwCTAD8NbCKJZYE8n7luJXqgnyQc6E6F93Y pLuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=h6uXKl0tUCfl08p2NwWTeTQTNvBkftMiBGuKvpgJW90=; b=bWnPQMX5KDH1g3ROyGAuV7QnVwmcVmDLafo+1gtZmkztx/O8uIZvPNIRkTxcFtoDi1 AfsLwrdiotO7KE3A5Ok5or6ysMuxk0yYlxkuofqPoTCulRpq4Ys1kmwENpqu4XRYgQTt lrFDMvYBEBVkmmGUlFjDp7t3UiDoF61yCaqQszKVCqtPINzXT8iygDswb0y4hYv1oISX 3Qoq7cB+/tzGLk7e8uM6kWw242hZg4yLvsSjcL+T1Uvdxa95O9/QyOZVBRPyTp8jVDWz uzTSRUyedgfTeD0XB5B6fjK2X9XK6+IH8kravsJFLW+XlUdWLk8//otwMdAvjNzXu4PL +4jA== X-Gm-Message-State: AOAM5309nfxoSWJBzYox3A03n5DvXZD90vDnL/RDHKd009CmOc2y+4XR m5cIfVRXPJWmQ0zlhF94x47oLWndQ84= X-Google-Smtp-Source: ABdhPJz7r20GrLrYKVxR4Rnh7NCrcjkMfFgbYLp5BYYWt4dpvg7T6Rt6KandusMgnE9JMy7syr+nBQ== X-Received: by 2002:a05:6000:1867:: with SMTP id d7mr1901044wri.199.1626989330927; Thu, 22 Jul 2021 14:28:50 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l14sm29438251wrs.22.2021.07.22.14.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:50 -0700 (PDT) Message-Id: <7b98d092811c3b479b41e5ef3327d795d794fde2.1626989327.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:40 +0000 Subject: [PATCH v2 04/11] t3320: use git-symbolic-ref rather than filesystem access Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys Signed-off-by: Han-Wen Nienhuys --- t/t3320-notes-merge-worktrees.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh index 052516e6c6a..6b2d507f3e7 100755 --- a/t/t3320-notes-merge-worktrees.sh +++ b/t/t3320-notes-merge-worktrees.sh @@ -46,8 +46,9 @@ test_expect_success 'create some new worktrees' ' test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' ' git config core.notesRef refs/notes/y && test_must_fail git notes merge z && - echo "ref: refs/notes/y" >expect && - test_cmp expect .git/NOTES_MERGE_REF + echo "refs/notes/y" >expect && + git symbolic-ref NOTES_MERGE_REF >actual && + test_cmp expect actual ' test_expect_success 'merge z into y while mid-merge in another workdir fails' ' @@ -57,7 +58,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' ' test_must_fail git notes merge z 2>err && test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err ) && - test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF + test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF ' test_expect_success 'merge z into x while mid-merge on y succeeds' ' @@ -68,8 +69,9 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' ' test_i18ngrep "Automatic notes merge failed" out && grep -v "A notes merge into refs/notes/x is already in-progress in" out ) && - echo "ref: refs/notes/x" >expect && - test_cmp expect .git/worktrees/worktree2/NOTES_MERGE_REF + echo "refs/notes/x" >expect && + git -C worktree2 symbolic-ref NOTES_MERGE_REF >actual && + test_cmp expect actual ' test_done From patchwork Thu Jul 22 21:28:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12394839 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B6E9C4338F for ; Thu, 22 Jul 2021 21:28:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 745A960E8F for ; Thu, 22 Jul 2021 21:28:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231613AbhGVUsX (ORCPT ); Thu, 22 Jul 2021 16:48:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231717AbhGVUsS (ORCPT ); Thu, 22 Jul 2021 16:48:18 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05830C061575 for ; Thu, 22 Jul 2021 14:28:53 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id l11-20020a7bc34b0000b029021f84fcaf75so2364892wmj.1 for ; Thu, 22 Jul 2021 14:28:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=vysnlRXYw/aOCYJK3a3w3iXK3uaa7j22KJHUUCfJpig=; b=NtsSzau1dZxj4UEJuRM2iOTs+KCIOsr6P6yHuNFJgxXpg1SxdEa3U13UlDm2RUkaDq pBXI8lLRbaR3fviw5IRydAV1+ug5Cp+1233Mu9MpMbKkFcd946PoeGv0ph9VkUNHhJXr DGt60Sq2dxRG0fmnwYWaUHcHB1sVos0U8Zxun2dtQb3JVmo55z5nzM7synGkbCR2nRvz 8CG6xWNdDboXZP/Vw+uzwVKUPfZgMAw/eAXfssPsBZkekMs8PC1gjFuWBcgjUroFhDY3 JbTynEKiiEj9Fk351mnlJ4SmMenXfIReApgezQlee9ofbtv8w1+Cc3qlrHHQFDf8EVYV q12g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=vysnlRXYw/aOCYJK3a3w3iXK3uaa7j22KJHUUCfJpig=; b=KpmpckMAe1zjWCosgwffoD8B0jA3B1J7A2E2vfaGlhL8dUqUepoCfU3bx7uq/AD5W0 kuqe+hp0kNMcFhWu0qGkiN8YSfc/8pFDXMEGaD7QtW8mSUbS0MJ+Jo3R4xRze/9Rsg5c SSgeMpEX6Z5AW/B7FXKpEEz/0I+DpGipoptK2Y3MXbawbA7wzb6kYLf9oTGDDOk78UDK Te/GEqUtKatZf7gBOMFYkZKCo201Ex3sluuf/GwsFY4BF2KulfwIHkxPDHsToALJU6Co oTPbTvr3VwtMTjjuKR5j21c/K29tE99iQx94gFkjWZtxZ4LM39Q7ZHJ9gVPvdeu9nl/8 3xwQ== X-Gm-Message-State: AOAM530pQn5g7Tw7c77621QaCb5S9iSoZfkWGJ1aiwiLYY9TyaRl4Ijz AshvpPZQ1R80Z9QszyJpjQFiKgFwW1Y= X-Google-Smtp-Source: ABdhPJyLwKOdaD5X9ndPaf7AiVVXNFsqswO8HDbPODXVprqYJ4ovg16jr0mPmb7Cx/dtEG8uDB5X7A== X-Received: by 2002:a1c:7f57:: with SMTP id a84mr11278653wmd.46.1626989331516; Thu, 22 Jul 2021 14:28:51 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g138sm31185212wmg.32.2021.07.22.14.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:51 -0700 (PDT) Message-Id: <0047266de6bc2f7f198cbc73cbb1e8adf2581535.1626989327.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:41 +0000 Subject: [PATCH v2 05/11] t2402: use ref-store test helper to create broken symlink Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys Signed-off-by: Han-Wen Nienhuys --- t/t2402-worktree-list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh index fedcefe8de3..4012bd67b04 100755 --- a/t/t2402-worktree-list.sh +++ b/t/t2402-worktree-list.sh @@ -230,7 +230,7 @@ test_expect_success 'broken main worktree still at the top' ' EOF cd linked && echo "worktree $(pwd)" >expected && - echo "ref: .broken" >../.git/HEAD && + (cd ../ && test-tool ref-store main create-symref HEAD .broken ) && git worktree list --porcelain >out && head -n 3 out >actual && test_cmp ../expected actual && From patchwork Thu Jul 22 21:28:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12394843 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 347C3C4338F for ; Thu, 22 Jul 2021 21:29:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A83460E8F for ; Thu, 22 Jul 2021 21:29:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232035AbhGVUs0 (ORCPT ); Thu, 22 Jul 2021 16:48:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231799AbhGVUsT (ORCPT ); Thu, 22 Jul 2021 16:48:19 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E19CC06175F for ; Thu, 22 Jul 2021 14:28:53 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id r2so231641wrl.1 for ; Thu, 22 Jul 2021 14:28:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=GxdkICMfkJfONoA52legBp7SYC+/2dCgdEj9w1NHQXQ=; b=qm5xl9P1p0mnEYL8lZf4ypqmHORQn7iBYC80qDLgIJLLqBI7jqgz0ME4PHRAP/GCAg M19SIye2n1GEKSdCZbuD0GdzIjkF2/a1KZbpVJDGr8/z3hGUT7G1JogGdO2QqyzpTQ6G 5ZVTa4jouhQZnfPWLJDV54yL36wv/YTZ8far9MoyPEPJ/ycUITsOPtTW/oZJRKrWkvPD xjngKrJD8f2wH15O5A7AOenfcCgLhi9kAQ/+PbMB61b/GzKd2P1SmfLTqd4dRkmyrFfM fccgb3tqoQWJZ/XiinQu1jmKBgVBXXflBF9WjIR29SEjtvR2hkqyGtTyXD28U67twIlY JwTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=GxdkICMfkJfONoA52legBp7SYC+/2dCgdEj9w1NHQXQ=; b=Ji0yCCEo7zwxxDQmbhjot9idGaXDpePt6qq0FKEESC/8vwf1Mqs9maQRYd8w7Y9A4l IQKlzjn1uqMu+QmMy5XJhnYhGU4h+PehecBAO6x43IDJZn42QpBndqk3jLpkcKbOnlDS IYP8sjrMmmAj35EdI7FBJDnZ2lxgQnS+1M1D1roWA8W5U9k06v+PbdkY5dEbeSU29mxQ 3xxsVIyNi6D8VwmecPkKlPFR8GF9ajx5TZKdy6PiQs43KjHHtsEIEtGciUWFkN+TfXxz PYSGHC7Ae75xU/yhLqdXIUw30JNUr8DYR9Xw6m9auyh7mojQf66gvFAQtE66T49PW/xR ZX6w== X-Gm-Message-State: AOAM533xdRBU/G9u3CUiommhHCYtFZYABjiZJwsXVfdj2nBJt6QlLWGz Ob/4xr8IzGcWoJIIqslrbkTg0gKllro= X-Google-Smtp-Source: ABdhPJwNQot+aIDeK+BkZ+AZKZ4gKf529VpEOUEsr0bG26CwlGc1fRKdhmoipFCrmzrei7t050J5eQ== X-Received: by 2002:adf:f7cc:: with SMTP id a12mr1875904wrq.278.1626989332092; Thu, 22 Jul 2021 14:28:52 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id w18sm33317020wrg.68.2021.07.22.14.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:51 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:42 +0000 Subject: [PATCH v2 06/11] t1405: use 'git reflog exists' to check reflog existence Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys This fixes a test failure for reftable. Signed-off-by: Han-Wen Nienhuys --- t/t1405-main-ref-store.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh index a237d9880ea..92b04873247 100755 --- a/t/t1405-main-ref-store.sh +++ b/t/t1405-main-ref-store.sh @@ -98,12 +98,12 @@ test_expect_success 'reflog_exists(HEAD)' ' test_expect_success 'delete_reflog(HEAD)' ' $RUN delete-reflog HEAD && - ! test -f .git/logs/HEAD + test_must_fail git reflog exists HEAD ' test_expect_success 'create-reflog(HEAD)' ' $RUN create-reflog HEAD 1 && - test -f .git/logs/HEAD + git reflog exists HEAD ' test_expect_success 'delete_ref(refs/heads/foo)' ' From patchwork Thu Jul 22 21:28:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12394845 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4538C432BE for ; Thu, 22 Jul 2021 21:29:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB79060EB4 for ; Thu, 22 Jul 2021 21:29:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231982AbhGVUs1 (ORCPT ); Thu, 22 Jul 2021 16:48:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231824AbhGVUsU (ORCPT ); Thu, 22 Jul 2021 16:48:20 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FE90C0613C1 for ; Thu, 22 Jul 2021 14:28:54 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id z8so177344wru.7 for ; Thu, 22 Jul 2021 14:28:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=uBIsRCe4J3ywO/HwV61EtjmFfldDclMkFr6D5F5d3/s=; b=rif/z1w/tTDnKDOFhZbqWDoibTns4i5k48+NS8+ErCDpWDvA4i4RtFIKP/qSir1dOO 7dHKlOEOg/xXXuNTyOnVJLKQW2lkRQmsVv85vuz8dkER/lohg80FQ9hGDLVGX+nXrb/H GSJUYslx7xTGpBT0Z/Q0n/XEXByf3rViz+GUUl1gmZFCsAosUOQQsYVJna2hAJ4BM58f Mbuiv5dfMpKtGyIaMI9o2dhmtkEpy4A7a7XahdO3AbsdjWVnhxuRbVHbvE+kHCbITDxh KDV+v+sxj9vImWTZaWrWktBlgiAJBzaSWs3lSCTP5p2ElIqouSp+iNjJbksuIE2sZEOt dGjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=uBIsRCe4J3ywO/HwV61EtjmFfldDclMkFr6D5F5d3/s=; b=ErNAa8CyhO6J+oqIhS4ScYFKq3itCQmEmw3CQhcYfD3SAzzx/6QFodm46XrM/jVKO/ e6zrfdIK5bvEUYdPSLMeYJivw7lWUpqCyUJtDnchVlRQxg7U59KU66qPzshvzCz06Egb QTbcY6Rtp9O7kppjPwIK0l4hELC3yRaqNLoSdVIaed/ZDsnYarvhEbT/SkeLH7llLJE/ 5J4PwtfO09qFT5dKNVJOzu0EDuYK1nZYD8YxWcx9W+Fq5ObnmDEkclCZOUwPCoC77ks+ 6OunuE65UYXjjjw4AJSc+oTO1qgq5KvtJzMBtt3/PvoocWwUKZZaPobVyvlRAYPN/ti/ cbJg== X-Gm-Message-State: AOAM530K1w6ChRWrWoDcpZ1nj3mC7yODcbORbRQ/nNtvbKGEjyP+X+bM a/5CEfx8LocA8ZDjoCh4eWYnvuIKeLI= X-Google-Smtp-Source: ABdhPJxThU+Ki9dJvwBzGIR8v3gvhoRDyGI9S02RWmJt6IIzm4b+z75ZN+otmZHFxbAAkq9F/eUFnQ== X-Received: by 2002:a5d:6482:: with SMTP id o2mr1830768wri.367.1626989332729; Thu, 22 Jul 2021 14:28:52 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g15sm25501441wmh.44.2021.07.22.14.28.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:52 -0700 (PDT) Message-Id: <05dead16f1cbc8d967edf101e170049bbe121cb4.1626989327.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:43 +0000 Subject: [PATCH v2 07/11] t1405: mark test for 'git pack-refs' as REFFILES Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys The outcome of the pack-refs operation is not checked. This was apparently forgotten in the commit introducing this test: 16feb99d (Mar 26 2017, "t1405: some basic tests on main ref store"). I tried adding the obvious check this, but it seems to fail on the freebsd_12 builder. Signed-off-by: Han-Wen Nienhuys --- t/t1405-main-ref-store.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh index 92b04873247..3517f54961d 100755 --- a/t/t1405-main-ref-store.sh +++ b/t/t1405-main-ref-store.sh @@ -9,8 +9,12 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME RUN="test-tool ref-store main" -test_expect_success 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' ' - test_commit one && + +test_expect_success 'setup' ' + test_commit one +' + +test_expect_success REFFILES 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' ' N=`find .git/refs -type f | wc -l` && test "$N" != 0 && $RUN pack-refs 3 && From patchwork Thu Jul 22 21:28:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12394847 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07C0EC4338F for ; Thu, 22 Jul 2021 21:29:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7D5560C41 for ; Thu, 22 Jul 2021 21:29:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232093AbhGVUs2 (ORCPT ); Thu, 22 Jul 2021 16:48:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231844AbhGVUsV (ORCPT ); Thu, 22 Jul 2021 16:48:21 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 934D4C0613CF for ; Thu, 22 Jul 2021 14:28:54 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id q3so265424wrx.0 for ; Thu, 22 Jul 2021 14:28:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=lvxys0eKz9+e7jI2OrA67HFhf87Sy524WHimOJM3rgA=; b=ZNcfYN3GntfLg7od4E2NMp6JlNhsA8BBAOgrXXO0zKMtyhnKxaC3PMOdM9MRv0W/fw o7G7VuJpbdhb2FBKbLwMkKGc/Cg2qIzgy6YMnswhpYABz89PUL/qaRctabpO29nRRzbY gqQZwKZtwjuJegih4Pook/kSXOB8bXIqGzW/61fUnb7e0eBrj+vKFnC0R3khrmlQzOSl xShDSWy0hfloW+isG95hmNQ78S/IZpmQaNvNhKRrz6ootRjZM9zGJUDXm3qqNG51Naut AvjjyuPcmtm1GD7Xc3rOFyl9aTGxIAuXjqfHlbHQBXnpk0WjQcAbu++Unl7jkFKMC/Gd Gk0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=lvxys0eKz9+e7jI2OrA67HFhf87Sy524WHimOJM3rgA=; b=YU07WhbWw+Wimv+HpExDJvnAilPTDf92oW9csMxQlk1jvc48MEOKdoKPObSsYA6lbz mNkW101TjzLUShs47BG1WONi94onQN3shhPDQh/1JRxAcEhNjghB4HynvMQ6aOvOXaT3 L27tKZ/VzuvSIffExJQhMhTGRufgazr75XDnZubXYRMNS+7FHiO2XtmxUO91VQaEiqyv MPX+3gilI4bKiErArP19j9HO3XUSjB6RVpV/ykk2xKjs3eR30Z/zYhpEXdvgBfIivgdL RfPt5N2BeH4u+t2W8nKjUwZ/Luym4sO1v3AWNooELUhPD6VMsOom/TFoPpAGQ94NCBA1 XoWw== X-Gm-Message-State: AOAM533DWWCIEZxnLBXIQAToM8gp7OsJ0iGxIAM3KNKKUS5PXMIozeHl vYtGb4UmDFj84Ug7pg3naEEfqwFP5yA= X-Google-Smtp-Source: ABdhPJyT2eRhRqBOWvNKgAXEtBVqnYe9hge6yTa2Z2ffMS7ueUK4lljkCRUptDaBO32Al9g313L6BQ== X-Received: by 2002:a5d:64c8:: with SMTP id f8mr1956474wri.290.1626989333292; Thu, 22 Jul 2021 14:28:53 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r17sm3372080wmq.13.2021.07.22.14.28.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:53 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:44 +0000 Subject: [PATCH v2 08/11] t1410: mark test as REFFILES Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys In reftable, one cannot take a lock on an individual ref. Signed-off-by: Han-Wen Nienhuys --- t/t1410-reflog.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index 27b9080251a..d42f067ff8c 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -374,7 +374,9 @@ test_expect_failure 'reflog with non-commit entries displays all entries' ' test_line_count = 3 actual ' -test_expect_success 'reflog expire operates on symref not referrent' ' +# This test takes a lock on an individual ref; this is not supported in +# reftable. +test_expect_success REFFILES 'reflog expire operates on symref not referrent' ' git branch --create-reflog the_symref && git branch --create-reflog referrent && git update-ref referrent HEAD && From patchwork Thu Jul 22 21:28:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12394849 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C378EC432BE for ; Thu, 22 Jul 2021 21:29:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AABA060C41 for ; Thu, 22 Jul 2021 21:29:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231925AbhGVUs3 (ORCPT ); Thu, 22 Jul 2021 16:48:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231858AbhGVUsV (ORCPT ); Thu, 22 Jul 2021 16:48:21 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CBCEC0613D3 for ; Thu, 22 Jul 2021 14:28:55 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id q3so265449wrx.0 for ; Thu, 22 Jul 2021 14:28:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=KpLmbp75Sux4pwv8U+t0kPz7J/1D/BqHpfoLRrm2OjA=; b=GZ/oXuem2inxCFWMt2pVaXBltXUu8JHNxzK1pnoTmG2FWIIdHWfiPJQG8A11wWDUf0 /9Nj9DLbt31RM90/s9BcpLEvpcBHRJwF+Ie/+T8A1ewsH1spsSMgIuKAnUksBK4gEWJj 9j6f+tSg6cJvxDbGj0IHhxLkba/C4L55xUwgJNmEEGtOBV+op0MQf2oagAidgx6IrFO8 X8dx8KE3WnFN1Z/ZEW+nEB8zFrMKheI6+l5JjltzT59BTMqckU5pi4Kxy10QMuTMvZm7 xlgVqKiEFZCcHNwpfhY/m264E9g2n5yjJelZJ3v00Zlu/g/1oWCA483KbAYZcBgHBI+8 k88w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=KpLmbp75Sux4pwv8U+t0kPz7J/1D/BqHpfoLRrm2OjA=; b=hd45DOBeLuGNDCNJBbBuiFFZb06rdk4dUPxpTo9Ezt7FoT01ggfCL7yKNqou6Sm6uU gJdSqxm0gc9CMajzf+3sCh3AE2Nx5seXABfZfpdozVXYU5UbC8d55J/6hYPUPX949bPw dZXyiP4/tgx8lC/97DoXV0KP3aw7DUT65C30yjWPKWPKiw2mum6xN0DrHH7YoAqvDjyU IQSYObOG6AN9W+Uf4KhfFDyTKeDEZsgjZbEltNvi5lXvcDohiTaLRQPIXoOB0C2BiJWt CgQ6jKWA1Jprvx7FdEw56hzhD4yprAV5pUyeZSCuRhrJkYLfmvG8YStkcxoPEdONzyOk e3bw== X-Gm-Message-State: AOAM531g8YjdxP29K8xhwPoKJTQp6pS0ZooeRbG5BA82AAABJrhedV/p 9a8FKUmjjeDx28SZAU9vXVl530A5v7Q= X-Google-Smtp-Source: ABdhPJxSdUqzJFiGvPqQL26FCOlLnA1ExRhVCzRo3VX7JB95RQXgC9bHPitrCnosfpRAklv4a4ny7Q== X-Received: by 2002:a5d:4c50:: with SMTP id n16mr1895000wrt.249.1626989333886; Thu, 22 Jul 2021 14:28:53 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p11sm30390946wro.78.2021.07.22.14.28.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:53 -0700 (PDT) Message-Id: <3685ba90f60ef95892a22c8549c9a3c0717d6662.1626989327.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:45 +0000 Subject: [PATCH v2 09/11] t7064: use update-ref -d to remove upstream branch Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys The previous code tested this by writing $ZERO_OID explicitly in the packed-refs file. This is a type of corruption that doesn't reflect realistic use-cases. In addition, even the ref-store test-tool refuses to write invalid OIDs. (update-ref interprets $ZERO_OID is deleting the ref). Signed-off-by: Han-Wen Nienhuys --- t/t7064-wtstatus-pv2.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh index 4613882caff..eeb0534163d 100755 --- a/t/t7064-wtstatus-pv2.sh +++ b/t/t7064-wtstatus-pv2.sh @@ -373,10 +373,7 @@ test_expect_success 'verify upstream fields in branch header' ' ## Test upstream-gone case. Fake this by pointing ## origin/initial-branch at a non-existing commit. - OLD=$(git rev-parse origin/initial-branch) && - NEW=$ZERO_OID && - mv .git/packed-refs .git/old-packed-refs && - sed "s/$OLD/$NEW/g" <.git/old-packed-refs >.git/packed-refs && + git update-ref -d refs/remotes/origin/initial-branch && HUF=$(git rev-parse HEAD) && From patchwork Thu Jul 22 21:28:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12394851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CB84C4320A for ; Thu, 22 Jul 2021 21:29:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89B9760E8F for ; Thu, 22 Jul 2021 21:29:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231799AbhGVUsa (ORCPT ); Thu, 22 Jul 2021 16:48:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231955AbhGVUsW (ORCPT ); Thu, 22 Jul 2021 16:48:22 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDA6DC061796 for ; Thu, 22 Jul 2021 14:28:55 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id o3-20020a05600c5103b029024c0f9e1a5fso2093165wms.4 for ; Thu, 22 Jul 2021 14:28:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=ig84R0Sxm6LpAKCKuu0dx6i2mLBpT0q/MOLlR15s+eE=; b=IHpQyRlLFxLLe6tZVoZ6WZbPfRbzsaml1NMfyW5dY6kCg0/mdVxHHTEtbfXrluqgCx t7iWJf+DKw3wktHE+h1j7Uu0kjvKKXtSOyrHpgcEhumn1nJfaUmY7VkP6iMpuefCgCdC GY4RhEQG6YCF+n2h+12WzzsbCllVQweTwgyzM62TtBGGzEXw+YjmkI9vxTNvmUiOEHVJ cuy0Ig5h93aqWWFvRZ9DDzX9FObhKAtr5kdKYj2oXfY/0GFQ06iNtaorG00ZVwQGtGUD 0IzmUPiDUXIb1ofe2oRFpc1M8+cd/G4BiRrqB1Kn6m9pKMwCzqbf4CxO7gSguxWdH620 7waA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=ig84R0Sxm6LpAKCKuu0dx6i2mLBpT0q/MOLlR15s+eE=; b=pzVFwKBy29cyyos43Aul9eIZl2AI/OyUFyAbVhxt1P3P/q7yQeGvOc9T3kAe5I2ljc BSLYerszftlM9phtFu8H/i4WWNf6GBGJ+EDuk85m58MJzoQqPcQae+1W3L7HaibRmjrY lbvO5WxkNHkv3/X1FVdgLPw/pVnhf9npshTWhkdZyVbyrcC4QmWBcUIX51RSSx5102cq aOeAXs0o44CX6R8+fElcJ9IUOXHbLif+VYPORjC6wkdq60EF5ZjLqeXoWuhawvkzUfd0 fzD/HNNToCPgIN3OgtmGm5jL+/kBzTBqhhQl5HeHymNJ57uUMxlSzuAirEBM7D0osoJ/ ZbvQ== X-Gm-Message-State: AOAM531v0EkFRH8gSuvqzaVXRH7V2Dslw+4Krp53uqlx/zf2uX6IttKi Z1rX4rl8IrKVVRTJlV1R8tNn+EbOvbE= X-Google-Smtp-Source: ABdhPJzGjIL3aNhvyVHCnJCNKf46/nzZeBeG2ObtaKnbiRst2k+DutZN2ce0CIVCPvAxroYo0RfgVQ== X-Received: by 2002:a1c:cc02:: with SMTP id h2mr1420671wmb.39.1626989334446; Thu, 22 Jul 2021 14:28:54 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n5sm3422434wmd.4.2021.07.22.14.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:54 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:46 +0000 Subject: [PATCH v2 10/11] t6500: use "ls -1" to snapshot ref database state Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys By doing ls -1 .git/{reftable,refs/heads}, we can capture changes to both reftable and packed/loose ref storage. Signed-off-by: Han-Wen Nienhuys --- t/t6500-gc.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index 10c7ae7f09c..c2021267f2c 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -241,7 +241,7 @@ test_expect_success 'background auto gc respects lock for all operations' ' # create a ref whose loose presence we can use to detect a pack-refs run git update-ref refs/heads/should-be-loose HEAD && - test_path_is_file .git/refs/heads/should-be-loose && + (ls -1 .git/refs/heads .git/reftable >expect || true) && # now fake a concurrent gc that holds the lock; we can use our # shell pid so that it looks valid. @@ -258,7 +258,8 @@ test_expect_success 'background auto gc respects lock for all operations' ' # our gc should exit zero without doing anything run_and_wait_for_auto_gc && - test_path_is_file .git/refs/heads/should-be-loose + (ls -1 .git/refs/heads .git/reftable >actual || true) && + test_cmp expect actual ' # DO NOT leave a detached auto gc process running near the end of the From patchwork Thu Jul 22 21:28:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12394853 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25634C4338F for ; Thu, 22 Jul 2021 21:29:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0CE8360E8F for ; Thu, 22 Jul 2021 21:29:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232120AbhGVUsa (ORCPT ); Thu, 22 Jul 2021 16:48:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231946AbhGVUsW (ORCPT ); Thu, 22 Jul 2021 16:48:22 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93B88C061575 for ; Thu, 22 Jul 2021 14:28:56 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id o3-20020a05600c5103b029024c0f9e1a5fso2093188wms.4 for ; Thu, 22 Jul 2021 14:28:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=CpONMo1NgsRjmLqGOdzgyXEs+Ovf29aJOIu4Ra261PI=; b=NQ4iEEpVFX817oF1nFGBDysJeryCeSG1r/iwAzF4s7qtyKvN0Vdbw0aj5DsBXSOFQ+ 6V9u9qv73Z+Q0JxevNjcfd+UQXBQwQgBCJ2voVs80MkawVzpoMZeveR23Wj6xCi59fyW AjBgU9ooUD4Da2lCoZXAdqcx/csnpmWTfYtQf1ENWzsdf/FjVX30SWn72AGE6FIYgGND PKpjZJyzrKUlxWpaNYDXj8QqBlfzSgutZ2jSuTsxxcJLkjAnjASmOPtfIHHkEUOrVNUF DvtYg8eQWOyiDQTl99KgTj9n9lGNywJcHR5kH6z3exAg46XvH53WIWflsqCLwOM2kfsI Jfdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=CpONMo1NgsRjmLqGOdzgyXEs+Ovf29aJOIu4Ra261PI=; b=PLMV1Col5Ue6dAGpYEX7IX25lj+sKW2Xo+GfDMJMCk/9QcR0f9qfDpEGOGrNxwkklC KZ+AXlv8X1pI0NGV7SzB4mbLDxQZpzRt+811zzoG3vNRVASpiw/UDdktJjgEIem0afGS 0DviWEk1F8v5Y5eZTa37aW6T9qco0eKvEdkRuciqgZnFe5yRP0W1TplRAfezM2EJkVbQ XMRBnp61XOZK1ttPHyEWSi2oSo/dnqpQNSjW4EEq0Gv0KzAHDSe5y/xOgtqZkIC3vwlg b+czBVWotMCJd8zp+hbbOM9OJiZhv8QqkUCMmh5I0epRZZK4gVPPU8MgJ8/PEdpcXgpn Q2+Q== X-Gm-Message-State: AOAM530vnzDIo0j8aZe6HKWJCX+tIrEYkFsbFOTZ0bXvAEYMDfR59pSM sFrPVNJcWnXsI2f30DrAzMQfwHeK8Pw= X-Google-Smtp-Source: ABdhPJzGXh1yhSCFvnloyn2NSrOx8yKEjwgTITjKuTWX2FM+m+BQGqGu0sz1bWU9tuwf8akIq9R+Rw== X-Received: by 2002:a05:600c:19d3:: with SMTP id u19mr11470912wmq.115.1626989335266; Thu, 22 Jul 2021 14:28:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o15sm3558927wmh.40.2021.07.22.14.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 14:28:54 -0700 (PDT) Message-Id: <81e46f955363fee8576b378f22273436e28b3675.1626989327.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 22 Jul 2021 21:28:47 +0000 Subject: [PATCH v2 11/11] t6001: avoid direct file system access Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys Signed-off-by: Han-Wen Nienhuys --- t/t6001-rev-list-graft.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh index 90d93f77fa7..7294147334a 100755 --- a/t/t6001-rev-list-graft.sh +++ b/t/t6001-rev-list-graft.sh @@ -23,7 +23,8 @@ test_expect_success setup ' git commit -a -m "Third in one history." && A2=$(git rev-parse --verify HEAD) && - rm -f .git/refs/heads/main .git/index && + git update-ref -d refs/heads/main && + rm -f .git/index && echo >fileA fileA again && echo >subdir/fileB fileB again &&