From patchwork Mon Aug 2 16:53:26 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: 12414397 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 E4011C432BE for ; Mon, 2 Aug 2021 16:53:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D0BA961102 for ; Mon, 2 Aug 2021 16:53:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232993AbhHBQxt (ORCPT ); Mon, 2 Aug 2021 12:53:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232550AbhHBQxt (ORCPT ); Mon, 2 Aug 2021 12:53:49 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B8C4C06175F for ; Mon, 2 Aug 2021 09:53:39 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id d131-20020a1c1d890000b02902516717f562so377339wmd.3 for ; Mon, 02 Aug 2021 09:53:39 -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=gHGASDUeMqi9tpdHd0qgtVzWSif3Od4nOJWgCGC0eo1FwaXIPEnPeyNZX9YOoqkmD3 51s5sQRodq9ZRM1LFfm5Wf3bOmPmwT3P1vEmbzQxWwSXy0PnBZZcC5rwh26nizcEoPgY h/d/3HRFWu9e62374XDXT2fHn5a07POkvrnOBE05Q+a3SgpNylmkdHX6/b2bLRvmQ97D tu01xbBHwBQ0f6NwGeaTM6Ik3IDoOUENm6JC7w8lvQnaZMoDGmBY+E4UKHaAktYo7M/d H6B22Ar4WDi4QDpQC46ga0lOLFAWbIf8DfW3Cf1IwIiXZiby7zoe0ZwjO0tcCob/RcQ0 yFlw== 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=uY4b2wwrsfwE/RNCxZQ4oJj7VMaQk6HlLsaqHd+0oiKXcgWDgJIeYg1PZ1As/wFu+9 /t0UkVJSZiwLlbp3rcKsgDGW39cZN9/grAXi2vs/To9DO7iGeePPb0SkO7k2eeCueIyc bkeZkNW8rPFEOEbghdKxrCEmRd37LIIFmdJBHZ/P3tMxcsHWKCAx8Sqpx6xS+o2MmJhd FeCnqfJUM759DSOrcE4rviBVhH/K1niNyhJBT6dtoBq9cQb43erl3ia5K9cYXo/M9z78 peMp48kfvEacLy0xxji8OfgTVRDzdinwog/dO0nKzZLJAMQr1/1h/RDoCJ1tw1YjFOK3 xE+w== X-Gm-Message-State: AOAM530D3dmjERnUvldnaT+hLZzC5rG7BcPWQx5OwLr4FiP1w/PI4lIL bTdpXZ/tCV9KMnzzM3uP6ckM7zIl13k= X-Google-Smtp-Source: ABdhPJyXrjI287G2o+uIEuEc9K5BUeVmTlJodk1HFWQp94UTyMCGHvpnU81NX7DpDqQyZhET1czu1A== X-Received: by 2002:a05:600c:4105:: with SMTP id j5mr17926774wmi.86.1627923218200; Mon, 02 Aug 2021 09:53:38 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m64sm12703175wmm.41.2021.08.02.09.53.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:37 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:26 +0000 Subject: [PATCH v3 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 , 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: 12414401 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 C6748C4320A for ; Mon, 2 Aug 2021 16:53:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AFAEC610FF for ; Mon, 2 Aug 2021 16:53:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233092AbhHBQxz (ORCPT ); Mon, 2 Aug 2021 12:53:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232992AbhHBQxt (ORCPT ); Mon, 2 Aug 2021 12:53:49 -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 27620C06175F for ; Mon, 2 Aug 2021 09:53:40 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id j2so22185147wrx.9 for ; Mon, 02 Aug 2021 09:53:40 -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=rhv+2A8YwKNfDifPi3kuz6dpUTGMNr5zlB664pmV091Ib6nPNrxgIpA9UUfMNarP9Q gFzubIfu6zal5qkjJqxol47O2veJBHZZEGBNR7EzKh0a3xuzUOnu8BU24ify0ALl5u/L EKSEXkKI69P3ZkR1IDQjXNTwPGsWKa3fP/D41BPJ8gtwf47BeRCy3rv23ImMFM+uSGAY SStlfFMBmY/aArrhtttsFPVBfmHrH7dpum6+n7++kRomLH9pzWA756tQocCx01bXPuEW 3sPlYZ4D2vTs60ITvvbr8AdSUkMlrQ8Swwlg0GGNbGjZ3HYRZv3XKYWohl5y5gCsEAGM klvg== 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=XBYvariIPmeLDZtTzLIoDKXWm7R8xQ3dpCIgRbSSzazY65oZGqvky8DwH3F0iBHvNN uOunxxciF8WeTKUQkeu2SdDM+mmdv6JxsdtMqxTPdH1IzzG3+0FTxDHCbokpJNaMsecx rdmlKfoDtDCi01IeJsZBsvX3aveqiofrxBWH1bhT0qY7+d9elVX1AqyhuOLGv+NeFFmZ fM1z0p7AdApj1KAUXssozFZoiwccxA3lUHvDMt+7qwfbTXxchs89l+yAhIb0cheTvpu0 3B2SoDacUaGidBmlOK08852VVAkq09Ai6amIV7A6hL4mDkBShS3XL0HWeSjRE8zrXw5F gh+Q== X-Gm-Message-State: AOAM5331J2PeRmTSCuxsvHjKqfY3aW4DZOdpYBHhMOdjkvs7Yq2qkKLp EQdKBeGwHzvJ72dZ1CRSFGMDCmlCt9s= X-Google-Smtp-Source: ABdhPJw4CMsLfsI4n7cx8mXP6ZF6SYfms3txPaWjUGdZmeG4f1bMOGbZojB3Udv+GcK6M4rpc0iNiQ== X-Received: by 2002:a5d:5985:: with SMTP id n5mr19280559wri.63.1627923218797; Mon, 02 Aug 2021 09:53:38 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r2sm11855194wrq.15.2021.08.02.09.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:38 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:27 +0000 Subject: [PATCH v3 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 , 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 Mon Aug 2 16:53:28 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: 12414399 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 03F03C4338F for ; Mon, 2 Aug 2021 16:53:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E10BA610FF for ; Mon, 2 Aug 2021 16:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233043AbhHBQxy (ORCPT ); Mon, 2 Aug 2021 12:53:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233006AbhHBQxu (ORCPT ); Mon, 2 Aug 2021 12:53:50 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B72E1C061760 for ; Mon, 2 Aug 2021 09:53:40 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id n12-20020a05600c3b8cb029025a67bbd40aso4041919wms.0 for ; Mon, 02 Aug 2021 09:53:40 -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=CFwV6BbyogJ3B8UnoZqzokq+AiHaxS3oV0JLjiTJXuIAM/UuEVT2kZQzAJD2O2PNU/ 5vU5XuaYy1QootesEONoI2iej7iW5j2hmvonzXLrHx/+BRx7N+DetOCKbau+goHJoyKm +UvGF/wG8jkPt8/GE9fZZQVA/3lJVlxn0IkQK7AHqLTWo8d4u4u4J2Wl0l7juh3hqgmQ kmVITX7nhRGcB/vwmsuinJjTdmwU3NzW8TO0MuinxNV+q/yWhZWw9f7uPxV6aKN2KzIb wrP3Bj/0R8rVk57gdQiqGNzu12SKxAQYVZTa53+0S6cstDMgYTmjUkyqmibKDOg5HIzd LUfA== 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=J5W3w9S/CtlziHlNYM1X57NksD9a3bKu7fKV1mDXOxgyK9alAa/367uaci3lKiAqmG Juc8YbHDMudAKOOK/Txt1N+S7oB2GlF1AgUG41ObwrBiBlj0l2mfuNvHxpR67/LjXGgD /Hz7ruKZ8rbQ9QLyEUMYZ5Jo+ZmrV7gBKVyfRjVlgcHANlG8bk6KO46efqpPzhtTh0He nfoKgoidIHEZyvbn1GVsTW7qaF2zaHScunOcPr9sofqWmVON9DiGSOllBlcxdnsQmtcl WtpRHj5trURHVHlXtABCCyxZ4iReU/MPm5RdBvREqprVtT/h+JJVTibxPdyYf4jPjnEE kt/w== X-Gm-Message-State: AOAM532+QSI6duhK4bV8ByPTFWtqk7vvbPlVRhUEiFWjY1/Zpz37FFOb AAqAMrlQvp7SRlwAqwrzATwV0YnuS7E= X-Google-Smtp-Source: ABdhPJyMy3YE71UCMSbtN74wBxEB2mDhGJNTOT45/i1VYTIuqPLnEeBQjKTQazYGMgW/eqZfYyhV7g== X-Received: by 2002:a1c:1b17:: with SMTP id b23mr17756871wmb.178.1627923219393; Mon, 02 Aug 2021 09:53:39 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q5sm12264107wrx.33.2021.08.02.09.53.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:39 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:28 +0000 Subject: [PATCH v3 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 , 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 Mon Aug 2 16:53:29 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: 12414403 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 6DE0FC432BE for ; Mon, 2 Aug 2021 16:53:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 55A0B610FF for ; Mon, 2 Aug 2021 16:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233116AbhHBQx4 (ORCPT ); Mon, 2 Aug 2021 12:53:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233015AbhHBQxv (ORCPT ); Mon, 2 Aug 2021 12:53:51 -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 73580C0613D5 for ; Mon, 2 Aug 2021 09:53:41 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id a192-20020a1c7fc90000b0290253b32e8796so344932wmd.0 for ; Mon, 02 Aug 2021 09:53:41 -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=HZf0n0KNT7Gn2sAUcdi8Y0/EKcyD6fQARMarOXLZXykgxsOkDKUKcbRIUo935Nk/Rk nopqV2GNcUzCuCyJ/R0UYdez/VHFtxIoUw0CvBT9LkIdq8Apt0E4dc4hZhlOMs7YlPD9 g5EBTl3wzZinZv8jPYiO5he9Rx0qZ1Cn8ev+umpnyhogjw/4+ZYgv26+bBVEQNaNEy5T yX18iHfAqS32DzjZiBWmFmMZr+eQLuWyBCmO0Czm48QlhwPKENPY6xTOHYDhuGvt2B6P KyQaFM9lWbNJyCVZdMQGbs8p6VGX/5PoApLFUah+D46xzrDFMGM4hNNjYj1oro3HbxKT HX/Q== 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=nc2c9YUyfA0ti6NRrPVULUfFAClZO+VeEshz4Bc8uZKyZ+qIUxXSlTkyLnBvVRcjOD AV76FZWDz17OK1bJ/IfschLJfZAR1H1L3Fyt1KCqx8bBjATP4zuiEfuNu8/fbP6yEHdf o2Glkn5L3jLaxmzAqlHV6HtgmMytYBweFkPFCOUpONOG/1t0/5MYcl6k1nGSi47aGhVO MnpiG3hGv21I7zu1Y+5YYKY/6nw8pmgC/JRjPDz7PoT9uACIakYXyxiv5QKjjsXl9x3g NDW1qFYwwILpy8h6PBWhg1sefBceuA2R9Vzk4qPXJz2QX7qwXe+E8kjbumfemzIOtvS8 ZRDg== X-Gm-Message-State: AOAM532D44RQaPWr99DwUVgxLnizi5bhRYNFzBkv7OdApziT4aaCiEHr CVghPesJRVGou/SphdRe4f/W5meCY60= X-Google-Smtp-Source: ABdhPJzmOe5dBjQp583H6lwut08HEcNWElg2pjvTb5DDz6FeOhocHQfjKWurhY5kSN+fEXTVQJJwRA== X-Received: by 2002:a1c:1b14:: with SMTP id b20mr17611391wmb.170.1627923220125; Mon, 02 Aug 2021 09:53:40 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l41sm11739698wmp.23.2021.08.02.09.53.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:39 -0700 (PDT) Message-Id: <22bff0b0791ffa402b6cfb79ecaa589bf0617d85.1627923216.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:29 +0000 Subject: [PATCH v3 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 , 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 Mon Aug 2 16:53:30 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: 12414405 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 D5F1DC4338F for ; Mon, 2 Aug 2021 16:53:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD5AA610FF for ; Mon, 2 Aug 2021 16:53:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233147AbhHBQx5 (ORCPT ); Mon, 2 Aug 2021 12:53:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232550AbhHBQxw (ORCPT ); Mon, 2 Aug 2021 12:53:52 -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 27436C061798 for ; Mon, 2 Aug 2021 09:53:42 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id k38-20020a05600c1ca6b029025af5e0f38bso3077295wms.5 for ; Mon, 02 Aug 2021 09:53:42 -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=jFqbOXtVgF+Bd0iLcTEXQZRg4t48GSXhuarF/Z38eKacyOZdterEvVS/dNSApfox29 AzRiAUMaHA/54/15UMKtpZMcY/KKwqceth3XThbajVn9Oqj/ufJ+8cB4BWNrS1kr22oV dNvSwUGicZf8IQMlqqb598dcXzN/vBy4vM1cQ1p2rON9pjJyRfAwntmhWyrW6bcY5/PT u3NBgqLsernOBgjpfWZbwx17jlpQ7octOpunIMmQ3+eQflGbrhoT4mV4qZxCET4IRGyi GLmA5+kIL0JmR3G94cQAq2rJ3UJ9/2bhwu6JFzDljVhxNC3sgRfH1oUZfduB4U2VkdVB IpNA== 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=kUJ5mm7m5I8ChfN+VmAWqMMrBq4ZM3T+8pu3Io7Tjl8dhLO6BmNdsoAeRJTWG+PTI8 gGtMKlUuhmnsDL0o4WBFzyPvjwwu6+rJdhfYRvdv4Lztiq27V3OiSprDCGU0PpnLYu1K F/0Y6acVwEw1GB382b+FvZGu5ftqALgrWRHACYZVTs6/bUvznghD46xjRBqy9Moxxxp9 HidEKmwGrAOlM+Zusy0Sv9Hsl4ySk1lXOJLHkIdpmWhdCowrMsabZwcj2JbVTjDAa0xu iVpOdCkhnBthfTVZa19Ql52DG4Dw+gvFw8BSOe7pGdfBeVp1KvQlKxuiuuvZw9+Rdp+X i6Pg== X-Gm-Message-State: AOAM5332nhMwHOJbYNL0xsa9V5ZCWuSQrqozC8gwcvZ+sqkYqQnz9nMx 0m8ZJJh9xXR7v0DtgJk1o7vn1GAvizs= X-Google-Smtp-Source: ABdhPJzV2ze/K1ui+VH92HjI4AyWHvcT/fPyNOA/7Ba/ZpQ2Jcq4xpjaBumaD2i065TTccWHzdUEeA== X-Received: by 2002:a05:600c:b51:: with SMTP id k17mr17253404wmr.119.1627923220837; Mon, 02 Aug 2021 09:53:40 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l7sm10468558wmj.9.2021.08.02.09.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:40 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:30 +0000 Subject: [PATCH v3 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 , 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 Mon Aug 2 16:53:31 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: 12414413 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 18B86C4338F for ; Mon, 2 Aug 2021 16:53:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3662610FF for ; Mon, 2 Aug 2021 16:53:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233249AbhHBQyE (ORCPT ); Mon, 2 Aug 2021 12:54:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233006AbhHBQxz (ORCPT ); Mon, 2 Aug 2021 12:53:55 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AAB5C06179B for ; Mon, 2 Aug 2021 09:53:43 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id d131-20020a1c1d890000b02902516717f562so377420wmd.3 for ; Mon, 02 Aug 2021 09:53:43 -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=f6rrCB09wgSkRdD8RnR41SSidXg8eZgTeJ56XmLM+qY21KtEfHMjIzC2+VCWEfRJVT 0m0pnRanjD4CB30SdW5b7z/YrhCCOfHYj0znl2KrNwvoABovH+t5a0RRsa/sgf4incLy Rc1JhzOriKBfODbK3W5EUH/35adKjLz8CrD5saQIg0+wgNkQ8ZxpuOdHyIMF3QhWnOst GjseLMMEYPSSrccUmehMV4imw0YawXatzw4eN9oFQj6jKM4aGHein2qSdGzNzVZVW/Fl jFz37F6DV40h7GUFJXol14lcS+B0BCUb5i1mafGBps72Zc2o+rzEKtRbc2zdrdsfQhIm iaaw== 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=VhZPf8GSfzSGAKxYf9ANTo2kEuDtKc6VV7YGfjkhjooSO7j563jraHGANgRuWLKBfz NrEQYL65gaZcyfwu7s1hUQBfRCDy4birbpvWREr0hI2WNdw6thjGpH5IWPhEd0NfWotw udGFRt+As4Z+bTXuQ+ekE6N4ci7FaV2+DNtVFkf7TCx+BqadNrguXqCzdsXI16nQ/0Af tzGvHdcS7610mP27XB8P+j8N9QW9LczFk5nbFQ0iVPUb7UIPYv+6IYo95qL9nz8V5l+r p9fptuBHeRZ/6uN6M99G+zFT/jm/bIexHAAuD57j4JhkE5Q1e7yAA3OLxNxP3/O2kctV RRTw== X-Gm-Message-State: AOAM531S5ZlXrL/qK0l493CsWzCSxRY9Erzj7S846T+8j/hl9lOUaVTl p8pGWSDrj9SgLIIhz/wrgLCbm9eJVok= X-Google-Smtp-Source: ABdhPJyQFxts8yHHuXyKfEKLvBvZFqsTepb4F/DA3LQXpuO2IXbpKrD+CoWsiQbIFoZVZe3iISF0hQ== X-Received: by 2002:a05:600c:3795:: with SMTP id o21mr17537337wmr.90.1627923221454; Mon, 02 Aug 2021 09:53:41 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p8sm11905645wrn.79.2021.08.02.09.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:41 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:31 +0000 Subject: [PATCH v3 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 , 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 Mon Aug 2 16:53:32 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: 12414407 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 DFEACC4338F for ; Mon, 2 Aug 2021 16:53:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C3B53610FF for ; Mon, 2 Aug 2021 16:53:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233219AbhHBQx7 (ORCPT ); Mon, 2 Aug 2021 12:53:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233032AbhHBQxy (ORCPT ); Mon, 2 Aug 2021 12:53:54 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C62FC06179C for ; Mon, 2 Aug 2021 09:53:43 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id h13so8769644wrp.1 for ; Mon, 02 Aug 2021 09:53:43 -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=cCEtgnI0jQA7qCA6yUWu3EmKTcFWr+2kEe8m8HQzJUg=; b=uVo7gOa05v8+Ab5xC60GMTowmaWKYwqBhkYRsELVSzOQcVybZPHuPaRYBYdG7ARPJ0 CGC5z6C/VncsBVbJKbf9UrYGQ0XQwVGtUSFssITk2Zu7ZYIIrzpyiC8Afqlb1ZQ0/5ag 6/KGmDJlEjTbbTre6xdimg7k8oiSvf0Z6Euz+3q5PnKEHymyx3peBdE3iDKW2xTTABk4 9dsziH8MY5MocIXAL4+H4YOf56VLX+s1KVkpyx02u7jbeXOacPD358prCqVFpPMyy3tL N63q325+ST6yW7h1tbD5mxPoyn0W87sv15oX8cw1oP7mJnUH3Wj3QCYbfLe7uVmO+M8T Qm+w== 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=cCEtgnI0jQA7qCA6yUWu3EmKTcFWr+2kEe8m8HQzJUg=; b=BtFSJwcfJ562iGWB3xP4o1U8iSKewgQPgNMZWtlToHTE7o6fTCHMxny8IHR5sjE1yN 7kbCfNxXo7F7nroRIpu1z1ulMO0XXYq0R5PLtyeQqMc3SJMrn/O690adL8Q9G1o0NKJ1 3xcH4nPFtxbncsVw5GKehH+jaT5Nu/dAHfVngjsLFFCCXW5/y7lKkOEvE1e0M3tk8ZwM lgTMx352AAdlvPvqGiOUHey5fvigbHOKC5mzO2uM72rueNfaG6YPAest9gzS2r2Ndpth GyUDvUoh3sR/5Zz/l8zvX26D+w8NHXM9EITO7x5womQU2qB8xsa7LlwhIDQ105MX9bnL 0glg== X-Gm-Message-State: AOAM530UzrpjbudC0dazfmqNXpBI0awLf16UpMXncsWj3SMWmAywLCpi bs+jnX0r0TyQ6EcuK9NL9P3HWV9eaaM= X-Google-Smtp-Source: ABdhPJyJ1Rgtv/BkEAvq8wVKz3wCeu3QmR7ylkL9Ji0JtqAobjYd4fa7DvCpNvWFG/VjFJqhxdB67Q== X-Received: by 2002:a5d:688e:: with SMTP id h14mr18353345wru.117.1627923222069; Mon, 02 Aug 2021 09:53:42 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t16sm2162336wmi.13.2021.08.02.09.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:41 -0700 (PDT) Message-Id: <5f9a01fd86aa52db48176ee347abdca394af5f14.1627923216.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:32 +0000 Subject: [PATCH v3 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 , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys The tests verifies that "pack-refs" causes loose refs to be packed. As both loose and packed refs are concepts specific to the files backend, mark the test as REFFILES. Check the outcome of the pack-refs operation. This was apparently forgotten in the commit introducing this test: 16feb99d (Mar 26 2017, "t1405: some basic tests on main ref store"). Signed-off-by: Han-Wen Nienhuys --- t/t1405-main-ref-store.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh index 92b04873247..49718b7ea7f 100755 --- a/t/t1405-main-ref-store.sh +++ b/t/t1405-main-ref-store.sh @@ -9,12 +9,18 @@ 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 && - N=`find .git/refs -type f | wc -l` + ALL_OR_PRUNE_FLAG=3 && + $RUN pack-refs ${ALL_OR_PRUNE_FLAG} && + N=`find .git/refs -type f` && + test -z "$N" ' test_expect_success 'create_symref(FOO, refs/heads/main)' ' From patchwork Mon Aug 2 16:53:33 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: 12414409 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 B13B1C432BE for ; Mon, 2 Aug 2021 16:53:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9955F610FF for ; Mon, 2 Aug 2021 16:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233015AbhHBQyD (ORCPT ); Mon, 2 Aug 2021 12:54:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233069AbhHBQxy (ORCPT ); Mon, 2 Aug 2021 12:53:54 -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 5B6E6C06175F for ; Mon, 2 Aug 2021 09:53:44 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id m12so17457258wru.12 for ; Mon, 02 Aug 2021 09:53:44 -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=seSpVRnyF3qCO7FBgEfjVHC57Fx6Tbn3cxCgWT3vZUg=; b=niJ/9cW1BXgEIJov646R6sO3MlIfYRnifE/F8YqfJsl6si4ZeCvtcVVYbBSMl/1Cp1 ZQL1N3IjlfZxaVPv15ONheownAeBq0KS34mfuMNRBrepyNqEvGxSnbXf51sRWKgqcxvh dMwKVWfUU6VNPQaCmmeYieXh1z134AmR7qRaaWZgtO1/yiOFIs6LSYf0QDo4YJQut85p lkEOm055jCnOLGdZa+t5IPyuEzgWZi70eoSwyObn7MXS23GsLoVV0S94vNhoDT6pidv/ soTE75ah79jSN6yKDUXqvK2NiVxQd8AIqEQt+E531rsfTIyDMS3XFWaQcVhF/eF+9jy0 C3Jg== 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=seSpVRnyF3qCO7FBgEfjVHC57Fx6Tbn3cxCgWT3vZUg=; b=loOLAjVO7oTJNab2nnpRXl48NlGBi6pMBaqE6Eyu/NxRNCpnAAi+d93+NQ/BTKTP9F jPn6LX6L237eRdFx+PmIx0Tin/spJLO5PcrlqwWymGRkKEQoMKJf9LkmC1TTltQAQqxy qa35ZWpMg6SchPwyqCeEudI+4qodrT7/Kxa/zuJzojQIXt5As/v51ofsJ6sZS7Vuhgtu yI+lJeCGThqQKsVpUU7unmALpO/ILhWam1Kew+9bFispwB2JRnIOR2/WkyPxfalDYljh 2kBmCiboocBlt8/r/ByOa00L4lKM+DTDHEYouRYYOZvWpT7xJLN1+b5x/V4JJTE0NZCT ytBw== X-Gm-Message-State: AOAM5308RookavKcDtAkFWfgcgzw8SRYT3+E6QfztXGiD7QNqjVGKBIJ Zg1wsf6Dsxw5eFVfeMTKF3Yq2WbqU7U= X-Google-Smtp-Source: ABdhPJwiu0tPBQLzLaeTA+ZB7JRpRzvG7G2V7cNXDNtUmtljWqFUOqf9OHV5m02KrxvIHwb8Tt3qew== X-Received: by 2002:adf:fd90:: with SMTP id d16mr19673525wrr.105.1627923222981; Mon, 02 Aug 2021 09:53:42 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e3sm12498687wrv.65.2021.08.02.09.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:42 -0700 (PDT) Message-Id: <45bc0772c64ee09a69122d3721271f827a21f909.1627923216.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:33 +0000 Subject: [PATCH v3 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 , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys This test takes a lock on the target of a symref, and then verifies that it is possible to expire the symref's reflog. In reftable, one can only take a global lock (which would prevent the symref reflog from being expired altogether.) 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 Mon Aug 2 16:53:34 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: 12414411 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 92C49C4320A for ; Mon, 2 Aug 2021 16:53:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E21761106 for ; Mon, 2 Aug 2021 16:53:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233232AbhHBQyE (ORCPT ); Mon, 2 Aug 2021 12:54:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233019AbhHBQxy (ORCPT ); Mon, 2 Aug 2021 12:53:54 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E57EFC0613D5 for ; Mon, 2 Aug 2021 09:53:44 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id l18so22233461wrv.5 for ; Mon, 02 Aug 2021 09:53:44 -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=qB0i/r4EGgUo33HWajScwvfSdq67CMHqW/vp4Ew5qoWVyKGp13TU0cnYjL8rE74bIT K8YtPRv3ykHapTSCqQqtRAecbACv5aII17vsvyMhvJ2GJ5hT0BKtMTVI7mQ9/ea9RwS0 on7Zhcbkp0zigMs5lvXQDkkoMFSKgz8kpaokZX8Dr2RpgN0srGDpvChGy+Y/qXU61dhR Ic21tGt6DM/bsJCzQnD/NzdwgHwMWAYu9eUjil26EpFl577IEGPazFHDNzS8/AAcnBBy /WQvNPPYp7doOasU1Y5xI2Bo3Gm8jd03ijnkcExT1K167qXzI4pUdd5NAQH10dOQBmn9 N5xg== 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=qdFQ1+REkxJRaJxM1wnGkZoN0/cbFvRpWxrCAb4kyLzyo7uJM2VRJFDrIEpCZwYn8n Bkh6FIZSy8+dKzVdwOOEoanhIhHK79PVf6ub0MuReD2I6S8sqsU910wUMDOPGjr4/rV1 mZHd9n0HvxPQAwVFmqlUbXq8tlRCFH3NzUQkMnVdWonBDqoufkeEkSUsoWRutAd+TKjn WOzOLJZLUiPOfmEhk6laYLhfpBLOgnZRVkUmHiLHHkwL55RKFmER6obTFsD91EAR19Zm XPNkplK3oxwFcrgjm9wiCMAfRTgt+VipsNREK5gKBOQeQDQvefPq25NsrB2p4fEDTmuX vqMA== X-Gm-Message-State: AOAM5315DXFmyHNVSGB5SWJuHu8E44o75wuRUUvpPhLtGQRoByNBn7hN 8ObrXWRAEiqstpg21vpvpOUcLh9tetQ= X-Google-Smtp-Source: ABdhPJxQ/qQ8VD/BIAXWCcUp4QieljHAnLlrRQLSogeS1acVxwZ1qT5atHfGJQBG4afDAF3TGGD6BQ== X-Received: by 2002:adf:dd07:: with SMTP id a7mr18138909wrm.377.1627923223558; Mon, 02 Aug 2021 09:53:43 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z20sm10425230wmi.36.2021.08.02.09.53.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:43 -0700 (PDT) Message-Id: <1326e99a1fd1704e44b4f2d1a5731fe9da4d0a8a.1627923216.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:34 +0000 Subject: [PATCH v3 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 , 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 Mon Aug 2 16:53:35 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: 12414417 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 6ECA4C4338F for ; Mon, 2 Aug 2021 16:53:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 52D0D610FF for ; Mon, 2 Aug 2021 16:53:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233282AbhHBQyH (ORCPT ); Mon, 2 Aug 2021 12:54:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233109AbhHBQx4 (ORCPT ); Mon, 2 Aug 2021 12:53:56 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82A55C06175F for ; Mon, 2 Aug 2021 09:53:45 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id c16so22217066wrp.13 for ; Mon, 02 Aug 2021 09:53:45 -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=CDVW6sUer+N3exZhLdDXIl1bpkzjCR6J5xk26HR3AoQ=; b=KJ9ekfyTUosfe7B7EM4DKea4/PDCn1unYWnvBSnkHVCGJS8Lk29K3V3H+qhjZov8LV eRAuOo0JTWlXCrwXtqsUZhvXB3ArsCEKRtFPDa16CLVlX3dHJLXGbqkUjQcOpZseW5L7 kdnLjdokHvsw9VzPnx1KiLA4MurDqXikLAg8Ofpi02uv7YPJXhKmU1bnEUh+e/ZVD7NH yvwd7928vyTZy8iP+dBQj09zOLEQEYaDoISZBD/LOcBEZdujL26Z0jznPeQNua+jQXc0 q485xwlPNAlyzHmlnIOskMihvIvqZAaTs+QjiK/Bu/Qk5JC+GdiTJXoxtOl+O3tw4ScW lS+g== 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=CDVW6sUer+N3exZhLdDXIl1bpkzjCR6J5xk26HR3AoQ=; b=f4xO+w/3XIBaDt+FhQ3YUUTVbdyScBqFV4XO2yEx8FxrGb6izKT7zMNml1doY4eJai X80o53gbGbAdQPPIvjm4bTY8aoe3z6BRcYH3k7SENVf/QjcrzgV+IugcgyI1A+NED/C9 zL+aRYai8Hh2jgvFcvhJ1k+pgz/LwxNvrzTpRByDvn7ym84gR7XDfi/cFWSaI8YYkMds EqAuP8fmrkiEIsKzty+RLmg0ThidJPQZDpwHY+g68CYS9t7EtP6hvftqDLvf0ep963Am PkzGVbGlev3lzRIHfkcHvgX2aOtqZcd90UXbVcpBEEDiFzBq4CEJNSdeTf4FFl+Hq5SR 74xg== X-Gm-Message-State: AOAM533lL0+U5pncSsh+O3FcE8ES8KYhBnKVxaBNkmBLN60cSw5XuZpl bmnJ+osQwXvXVWGUiRYFN7zsu4sIsnc= X-Google-Smtp-Source: ABdhPJyQUBYaf+as/SGs80FHEbWVm5Cnvjf2OACQd3gyCX8pDbsgytF3hF7VyVs/L+aswFHtbXaBnQ== X-Received: by 2002:a5d:56c7:: with SMTP id m7mr12688156wrw.310.1627923224223; Mon, 02 Aug 2021 09:53:44 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f3sm11972656wro.30.2021.08.02.09.53.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:43 -0700 (PDT) Message-Id: <55eb2094811cfdc7a9387f1b582784f11a1d16eb.1627923216.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:35 +0000 Subject: [PATCH v3 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 , 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. This relies on the fact that git-pack-refs (which we're looking for here) changes the number (loose/packed storage) and/or names (reftable) files used for 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 Mon Aug 2 16:53:36 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: 12414415 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 D0C9FC432BE for ; Mon, 2 Aug 2021 16:53:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9AB7610A2 for ; Mon, 2 Aug 2021 16:53:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233255AbhHBQyF (ORCPT ); Mon, 2 Aug 2021 12:54:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232992AbhHBQxz (ORCPT ); Mon, 2 Aug 2021 12:53:55 -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 23862C061796 for ; Mon, 2 Aug 2021 09:53:46 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id z4so22272243wrv.11 for ; Mon, 02 Aug 2021 09:53:46 -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=Oqy7fbClCErzxO0Ti/aKbq96ncaVt77aypfGVIxyk9BXkMFYVexdJLk1+plePBEp/+ PRgOTLW5JMFdxt2wp+rmS7SOOloEz+RWtS+faS7o2oWDgu32Q3BYZVkdGerAVbn1W6RH pHB9lqgbYg7qMI7OtGZaAOX1e2vRCQiUv4q3C2xWtnEfougkc+PNfYdL4/2hU+8D0S60 XLtnoAIUMC0rGU2m8e22yeMlBwFAHFBPtW0Om7/037S7a+5ZduKkoURd14joZMnfWtJA srjp8g/P+0hGyazpFD4FuXgqPmihMJ1oUh6JJlXorpYwJYgxnT4qRUJ0MAzHHbExcakJ E52Q== 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=Zjet+ysa8up5doA5Ikyths0mKKOSqXiNsHPZ3+R084mmChbhdzNDKm3y12bmXsvZgY DEwWEd8XrcEc53MgC4HblYZLaT2t6NzehonGWGQTssehH5NeVsSt9BejNaIITLHlk98Q uWirDf685tS11OoWitSwxtsQzYgOV+S1ueO9Fq1I5kYDDCc4N6sX7NcUIIta/EGFYZP4 B6NWuOJdDKHqcgd93xV04HU0d35OFzFtqBi6LL+IebxX124wJsed4S1L/IEkO/CQrS1o +o1UP+QOnJ1iJdfl1XzzODVKiyo0iWt/0x1u/qCfuJBFRiqvMN/w3heJUECB7lf+oC52 PJBw== X-Gm-Message-State: AOAM533dsK/KGWpzNSGJIgshbP36fBiXLL/e/E5Mf7KozsKV+0gmbdx6 Tg5qKzmqkAVeBoofGDdLTKzlStiSrU0= X-Google-Smtp-Source: ABdhPJwBEOzChDFYkSIqOOWtnoS6bjxXVg3pyvBJeuZzkHtSX8CiFkgd2EAj5liTI8OVb3rIk1eiOQ== X-Received: by 2002:a5d:6708:: with SMTP id o8mr19011718wru.304.1627923224841; Mon, 02 Aug 2021 09:53:44 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g11sm5031237wrd.97.2021.08.02.09.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:53:44 -0700 (PDT) Message-Id: <4a3418b795451aabf6b79b7d7f09e09fa9e5bbc5.1627923216.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 02 Aug 2021 16:53:36 +0000 Subject: [PATCH v3 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 , 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 &&