From patchwork Mon Apr 19 10:52: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: 12211421 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 A8095C433B4 for ; Mon, 19 Apr 2021 10:53:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 813096101E for ; Mon, 19 Apr 2021 10:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237479AbhDSKxj (ORCPT ); Mon, 19 Apr 2021 06:53:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232344AbhDSKxh (ORCPT ); Mon, 19 Apr 2021 06:53:37 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69F7EC061760 for ; Mon, 19 Apr 2021 03:53:06 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id t14-20020a05600c198eb029012eeb3edfaeso7939971wmq.2 for ; Mon, 19 Apr 2021 03:53:06 -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=pVIbHKHPh41o4/BwEY9XmDMRkGcfQAbU60mJBDzyIg4=; b=XSC6Bk6a8Gp7l3CzKkVIiTM9cANPI+jVkT/RLCV/VuIMTvmPrDKE8wo1U7ffP9VuCi 8h3LSc/C9GdR1f3bOy0x5ePCKLtPg/oyl2xsumC1/ZP2WrTVmCDcNUFRKb55gOF8QJ+A HyILrQ0DKxe3IU//3ux9Q24Rd8h724d69R0QRxlHss2EfVJc2ejr03YABXVyMrDWGEGp Vo9Do40o94RPtLvWSlS0UHODX14i3eATfKCIaWUGDd4RVm1+EN1+woD70n0B8WTdHtfg H4A0lH0/0Q8AiH7/hZ22Xw9gKosQL6gQZQLKjxNIWC7t9OoYoOkrNSecT4aesoVC7Trz ivyw== 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=pVIbHKHPh41o4/BwEY9XmDMRkGcfQAbU60mJBDzyIg4=; b=U6xGR3c6wxmkxVDVWeisjKwm8RVWj6PfaQ4cEHRD17AQFjIBsmb7QQVi39WOcBWLgf uSrgX7qYfvYqLwQhs9rD6FEkcF+ojLEzddaV5ALbtud7tQpCgj+LjTmn0GHDmbponDc1 eckDmIVn2JF3UO4yLYkWOeqNmDVX5Bqhdx521ZvQmp1rK2zX67UaADrnHdJT8+HiQ9Qa 2uOWsjwkdFQRgnHvuXaioH3j/myTPujl40G/rs/N5Jbi5TkZNK/tNApXhI988i7XHQ/D O7TllD59lR5QaWi2SZNjRPdzO2zX6WQLNYkhjc+/GipJ8CDh0+cm0XS7O/LylLPZMuPa B+aQ== X-Gm-Message-State: AOAM531muHPL1Fkw+zTbm8mnRdbMi3V9EIzxJPFsOHf5hpIpQWFzzswe RVOUAYaUX7sCxoargB2P4kd4j7S4VQI= X-Google-Smtp-Source: ABdhPJxYbsoVXJRdhGbc8O1ziww+M5l/UinH/A8j8k/8x88vru+H0NLlOf/2X70GnnywAGOb2xwTag== X-Received: by 2002:a1c:e309:: with SMTP id a9mr20586903wmh.63.1618829585279; Mon, 19 Apr 2021 03:53:05 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 61sm23798563wrm.52.2021.04.19.03.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:05 -0700 (PDT) Message-Id: <91ef012cbcc9a3106fa51236e20458f108e50ce9.1618829583.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:46 +0000 Subject: [PATCH 01/18] t4202: split testcase for invalid HEAD symref and HEAD hash 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 Reftable will prohibit invalid hashes at the storage level, but git-symbolic-ref can still create branches ending in ".lock". Signed-off-by: Han-Wen Nienhuys --- t/t4202-log.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 350cfa35936a..c575deaad4fb 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -1834,14 +1834,17 @@ test_expect_success 'log --graph --no-walk is forbidden' ' test_must_fail git log --graph --no-walk ' -test_expect_success 'log diagnoses bogus HEAD' ' +test_expect_success 'log diagnoses bogus HEAD hash' ' git init empty && test_must_fail git -C empty log 2>stderr && test_i18ngrep does.not.have.any.commits stderr && echo 1234abcd >empty/.git/refs/heads/main && test_must_fail git -C empty log 2>stderr && - test_i18ngrep broken stderr && - echo "ref: refs/heads/invalid.lock" >empty/.git/HEAD && + test_i18ngrep broken stderr' + +test_expect_success 'log diagnoses bogus HEAD symref' ' + git init empty && + git --git-dir empty/.git symbolic-ref HEAD refs/heads/invalid.lock && test_must_fail git -C empty log 2>stderr && test_i18ngrep broken stderr && test_must_fail git -C empty log --default totally-bogus 2>stderr && From patchwork Mon Apr 19 10:52: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: 12211431 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 A249EC433B4 for ; Mon, 19 Apr 2021 10:53:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A05F6101E for ; Mon, 19 Apr 2021 10:53:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238399AbhDSKxp (ORCPT ); Mon, 19 Apr 2021 06:53:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237708AbhDSKxj (ORCPT ); Mon, 19 Apr 2021 06:53:39 -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 10E5AC061761 for ; Mon, 19 Apr 2021 03:53:07 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id p6so26795672wrn.9 for ; Mon, 19 Apr 2021 03:53:06 -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=PNXYjsqBmokYYN4Q17OeJZD7G3XLhxhwmPXKh3TfUPc=; b=CqYgsJ9y9a3Lqe9qwePnTI7yAgd/w6tUahdOawSfSZL6eJ2Jq6A8C5/abpVy0wuuBb L65TkmAlNMsjxJm/rW7jbL1brHpfH8eHPVsRuF2mLHGS2ubgY4UgJ+0j+swcNrIWPrMB C14awNG4wob3CZMTdLHnMoCTC6Tt5JXVIo1MibCQlWHT9IKICua8W+1SuzRjx7a1RCAc cSoQtwGBbihxHN2pqC9nAKZICumuJZQYAmRkTX5XDQlElqsdmF5EAE5k0xGI4RBoP3At RKqEkaUHgP0rT81iN/4QmSQeWi/4sBn6X5QoYK+HMTLdOpTAUrcvc5Cx9BeaF1ipXLWR 6xgA== 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=PNXYjsqBmokYYN4Q17OeJZD7G3XLhxhwmPXKh3TfUPc=; b=Cy8eTJ/2F7bdHWWUCiSUGKTInpI37bHtvAw3VNhwwL1d2Vlq8Kz/jowptYBp/vnj3R d481lDi5f7QOlQVQOtBCV05LtCbnIXTu/8oxVv0Ki72CCaxdHu51aD6U32w+ftnSZxQu bGpYoWtsXw9xYz2tt8E3H5jtU23kaOPxrJEHRXFFCLtoIHI8sY9C229DSJbK3UjryJak uLZXcQY54luLStuvK9QsQVqAPqQfnMEGS0hgL+rXtBAfR0B/d/1GmPkMw1C9OEnEYU/f 39/oMMEH8m5Mb2lc1RqKnOxmnf2x6eTcjWaU9ONLm21Ce2kC8Ad0QJOtVQc4lkz7bmTu Rv7Q== X-Gm-Message-State: AOAM530GYqNLap1YOl84TbLHbuoCNHNJ40nqIRcmvNcOE7RtCXMIISdR j+KMRvsN7F2ioKczi9mnrTVob5xuOsY= X-Google-Smtp-Source: ABdhPJxwd8HSp4lOengK1QOVOq8TnaCFQCmpkLTunOEzEHkK6wV/zj5fbzcPCyE/eLjsOHSxGVgMGA== X-Received: by 2002:adf:e607:: with SMTP id p7mr13564903wrm.381.1618829585809; Mon, 19 Apr 2021 03:53:05 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g84sm15528296wmg.42.2021.04.19.03.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:05 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:47 +0000 Subject: [PATCH 02/18] t9300: check ref existence using git-rev-parse rather than FS check 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/t9300-fast-import.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 5c47ac4465cb..087ddf097036 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -392,7 +392,7 @@ test_expect_success 'B: accept branch name "TEMP_TAG"' ' git gc git prune" && git fast-import X-Patchwork-Id: 12211427 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 8CC3EC433B4 for ; Mon, 19 Apr 2021 10:53:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 680CC6101E for ; Mon, 19 Apr 2021 10:53:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238071AbhDSKxl (ORCPT ); Mon, 19 Apr 2021 06:53:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237670AbhDSKxj (ORCPT ); Mon, 19 Apr 2021 06:53:39 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83E67C061763 for ; Mon, 19 Apr 2021 03:53:07 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id t14-20020a05600c198eb029012eeb3edfaeso7940005wmq.2 for ; Mon, 19 Apr 2021 03:53:07 -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=hCsQOIxYRiZGmvP6afW8BZps1OSvbdwKuZbdnuIFjdk=; b=aGeiw8g40Ipdr91utGOYGVaqz86ikUgW4OnafeAqvnrxwUeKmmrfJnt4npVMsOnKlP WVjj6BPfhfVMsQxlLGHAqrjla2GeqYcLsUFVz+x9EuU8M8wiJjq1CibNP99ZwRwiEMBk Y/nBvxtTmD+lwdZ6ZPmlRoID1+JR8TVLs4YWS+nPaNCam7on199y+m1LdHTkJP5HztVA lza87uf8nhqdbNOuf7PC+R1Bfptj32XsXWco8irw6lYSmsk17+ES29XYPUFGYXGsosYx an31TUyaOiZ6uaSTnUjZR99e2beQ4Ve1aFySd+xJZAY2aXFfbfHrqZWc2brXoM1/P3KD 9mVg== 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=hCsQOIxYRiZGmvP6afW8BZps1OSvbdwKuZbdnuIFjdk=; b=hsFejDqg3IQlIX/8+tNlhldgiHuYlA827A/LRFrxZRxNl2ZJutQW7k9Nf21mhH+BUU iBDgffcJ3pl9ZPy2+lvkMCGCHc3+31qaVD2yPWRuwHEpTogb0hqshJKczK39gSu4d6H+ iQ2386VUiyQkiU4HIV0hlGC7Jcd2Lq0QqL1DI0DhtmblZ13+pmyYtWtF5fvy6/S02Lem 8qQUVlcR4BAood6IKBWOUyiDCXTyRGHF5XZfyAwglD3HhvsnxNzBa+jcKhccCxkSOIT4 PdT8bZa/LCHzIpNwXmmftW1ej7ssvBmqptMrnojPa8RTTQKvu432J6TOfHpBMeHlbmcl sG3g== X-Gm-Message-State: AOAM533ro5eXuUT4Ud22yDPl5q90D7lq5DUTfdqAoKSbA+24PpNxEK8O 3TK8qV1YBA3MaSrEprmAr8JIG3RA9F8= X-Google-Smtp-Source: ABdhPJywt+CKTFtqfTGxpzjxrEdb5ELi/FRGgRkGGNkTyAQ0oDxuRwJBqGeBXoHhncrGTdXcs/wJKQ== X-Received: by 2002:a7b:c10e:: with SMTP id w14mr20558230wmi.8.1618829586307; Mon, 19 Apr 2021 03:53:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k22sm21811158wrh.5.2021.04.19.03.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:06 -0700 (PDT) Message-Id: <47b5ec56a38379adf3eb48acd5a093bbdfdeb511.1618829583.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:48 +0000 Subject: [PATCH 03/18] t5601: read HEAD using rev-parse 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/t5601-clone.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 329ae599fd3c..7223372c7660 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -305,7 +305,8 @@ test_expect_success 'clone from original with relative alternate' ' test_expect_success 'clone checking out a tag' ' git clone --branch=some-tag src dst.tag && GIT_DIR=src/.git git rev-parse some-tag >expected && - test_cmp expected dst.tag/.git/HEAD && + GIT_DIR=dst.tag/.git git rev-parse HEAD >actual && + test_cmp expected actual && GIT_DIR=dst.tag/.git git config remote.origin.fetch >fetch.actual && echo "+refs/heads/*:refs/remotes/origin/*" >fetch.expected && test_cmp fetch.expected fetch.actual From patchwork Mon Apr 19 10:52:49 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: 12211425 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 20958C43462 for ; Mon, 19 Apr 2021 10:53:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E890C6101E for ; Mon, 19 Apr 2021 10:53:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237864AbhDSKxk (ORCPT ); Mon, 19 Apr 2021 06:53:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232344AbhDSKxj (ORCPT ); Mon, 19 Apr 2021 06:53:39 -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 18C91C06138A for ; Mon, 19 Apr 2021 03:53:08 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id i21-20020a05600c3555b029012eae2af5d4so8331932wmq.4 for ; Mon, 19 Apr 2021 03:53:07 -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=Bp5AIwcRTPdgJs69D4au2FynlT9u6XNqahdftzLfIZI=; b=Q97lVIfG30Hosp/IXHe4Vtktf19q/LrNnIR/G/HdHVFQixAsGNA9iDZkZJPc/LiDP/ jI+F+8ZEq9nL2Tpaxc3xjLI2/Z2x3N03IyozwG5zPaXyIZfTX6MRK3mpsliEsaHkWL+5 fq/DdHl63IK9bkcNTX3kCTPcZLFb1w8ExZg6tAsA/k31Kay9x2s2dVArGm3Ptp5jnYWC EIBDJu18MgncMGGhcEwxi1+dOE2Epg2vymaxkMcyLVQ8ltUP5PqtG2VuueuH0ms0UjxR qVI5Ic9CyBnyxwxpFJzwxF8JuME+8+ATJEeuy/5L7XmC2iJMSSTJC4U+2qR/QPX4IV3W X9fQ== 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=Bp5AIwcRTPdgJs69D4au2FynlT9u6XNqahdftzLfIZI=; b=Q3X4j+yXrGgDd4RJrMZReCmBFRvRouwAIqMuuxf76HNj5wADZOht32EYhCD/qS0tXB OzhpsPcWPso/2IOB3pbtt/AB3PZU2KHndd56r1ohh8N/HcqKmxMMyCEAhYI1vFvUebmZ 4awKaQN8YSts43DO4GzYGgt4fIILINU8OoSBCjoziOvfGTOS7HHWIJR/eeWnQY3A4Yqk 9Ch8Bt6ml3S+H0gRhtNXQk5KFtI1kljmXmYXfaJfvFkfjEq7tJ0gKpgHp9jaJpGQeICW lJnZs6TyupC9V8Rtl14V3k7GKPZFIBWTtStlp82GVp3JDJ/ppn5/19aaY6EH1pCV3yYT QNtw== X-Gm-Message-State: AOAM532SEBxfakSZthrcs31GMjI9P5ZBGRGpHSPE40NUHqB5vexGaNSk m/N0lIzOhieUlYjaeP8fZfUSZfEfUd4= X-Google-Smtp-Source: ABdhPJylsanjuhzeH6/5pNVxSxt3S0AGrLMvAS/5NCMyTTQYJ13pWfn/NwZTtOWcsKiabZw9AvRuSw== X-Received: by 2002:a05:600c:247:: with SMTP id 7mr18988892wmj.111.1618829586851; Mon, 19 Apr 2021 03:53:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n2sm22196905wmb.32.2021.04.19.03.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:06 -0700 (PDT) Message-Id: <53cf1069552b6cd6161ce6f69a31c44e59091096.1618829583.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:49 +0000 Subject: [PATCH 04/18] t1401-symbolic-ref: avoid direct 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/t1401-symbolic-ref.sh | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh index a4ebb0b65fec..fd5980d3fb40 100755 --- a/t/t1401-symbolic-ref.sh +++ b/t/t1401-symbolic-ref.sh @@ -7,18 +7,13 @@ test_description='basic symbolic-ref tests' # the git repo, meaning that further tests will operate on # the surrounding git repo instead of the trash directory. reset_to_sane() { - echo ref: refs/heads/foo >.git/HEAD + git --git-dir .git symbolic-ref HEAD refs/heads/foo } -test_expect_success 'symbolic-ref writes HEAD' ' - git symbolic-ref HEAD refs/heads/foo && - echo ref: refs/heads/foo >expect && - test_cmp expect .git/HEAD -' - -test_expect_success 'symbolic-ref reads HEAD' ' - echo refs/heads/foo >expect && - git symbolic-ref HEAD >actual && +test_expect_success 'symbolic-ref read/write roundtrip' ' + git symbolic-ref HEAD refs/heads/read-write-roundtrip && + echo refs/heads/read-write-roundtrip > expect && + git symbolic-ref HEAD > actual && test_cmp expect actual ' @@ -42,16 +37,16 @@ reset_to_sane test_expect_success 'symbolic-ref can be deleted' ' git symbolic-ref NOTHEAD refs/heads/foo && git symbolic-ref -d NOTHEAD && - test_path_is_file .git/refs/heads/foo && - test_path_is_missing .git/NOTHEAD + git rev-parse refs/heads/foo && + ! git symbolic-ref NOTHEAD ' reset_to_sane test_expect_success 'symbolic-ref can delete dangling symref' ' git symbolic-ref NOTHEAD refs/heads/missing && git symbolic-ref -d NOTHEAD && - test_path_is_missing .git/refs/heads/missing && - test_path_is_missing .git/NOTHEAD + ! git rev-parse refs/heads/missing && + ! git symbolic-ref NOTHEAD ' reset_to_sane From patchwork Mon Apr 19 10:52:50 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: 12211423 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 510C3C43461 for ; Mon, 19 Apr 2021 10:53:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F67E61157 for ; Mon, 19 Apr 2021 10:53:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237789AbhDSKxj (ORCPT ); Mon, 19 Apr 2021 06:53:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237308AbhDSKxi (ORCPT ); Mon, 19 Apr 2021 06:53:38 -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 8E64EC06174A for ; Mon, 19 Apr 2021 03:53:08 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id x7so33477928wrw.10 for ; Mon, 19 Apr 2021 03:53:08 -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=6tJDhCD7+nYF59s210KX3AFlvUqVEeHqvz7t9NDP7jE=; b=fZEFXKAXsX1PY6Z0mtitmZycJGm41JPUwyWXOA9r+IcblcbtcNYB0lF6qeRifzxosG wrtkg1LcfLfWvimapN7FnvSVuPyc9ktPzQYqeIJmqlUemL4FeqzWDL5k5Kj3qPGVzzfX FV0hHPcDwO8W2KI6c2N9dz9u1Qe/mThLQrG/3G/3pg/0S5PqtY5X8MiMMB+TFKdVc0+r c9Dnn/c9dRoLzQUV84ga5Sbs06EXMX/qbTIREtRlZYNONW67SBbe2ZtScWZziHSoHy6F arujEIGS4PpLfosgiO1MLB06U0mW5w1tnxsHd6p0RJhPqQat1E5j1bZiZ3+GW3BafNml 2nhA== 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=6tJDhCD7+nYF59s210KX3AFlvUqVEeHqvz7t9NDP7jE=; b=XYwxGbMb/5n/t0hi4W9hYTCfvmOpERLboXA/T2pkO9hrLrAfgyAl/AZ4lrj5nEmO4z 1kBNAgzYiLOQYzZrq60BjIstzcZhvQjSOZqh7K7ws7quROo1adAd4YwZ5OnVXDau3AqB Zj3F1owyfpO/T+U6I066DCWJ4RoG3YEZFf+HxTsYBh3JDQuryIEkWxgPs53Gun7+5KaI xvyBTCWg6r9964B4iSUDXUVnr6IY4gtszYfu4xftkV034cCfU5dKuHa1nST8EPhtaQzv xTxDuNtOlIaYZBMizKe0ZqqYu5QdnwQHQewyVesg34j+AAdULwGpHs9s7geAOhcEXCzT Z3wA== X-Gm-Message-State: AOAM533EWyzv0fj5afETI31VO8iHZ0RtYDou12OvgWU56MiFhbBiBWYo E9g8WVgo1rwftogJ+quauYP7mhqSE/I= X-Google-Smtp-Source: ABdhPJyWebAEhBzvWH2Qes+wNP0T96SpbHDpH/fRCDaM3G85goYOY0ueiUsYgIbJ3KCHOhI6T/tIyA== X-Received: by 2002:a5d:654e:: with SMTP id z14mr13743172wrv.414.1618829587349; Mon, 19 Apr 2021 03:53:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g12sm23376968wru.47.2021.04.19.03.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:07 -0700 (PDT) Message-Id: <223583594c0089ef259e83f2f10c08fd94f55959.1618829583.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:50 +0000 Subject: [PATCH 05/18] t1413: use tar to save and restore entire .git directory 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 makes the test independent of the particulars of the storage formats. Signed-off-by: Han-Wen Nienhuys --- t/t1413-reflog-detach.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/t/t1413-reflog-detach.sh b/t/t1413-reflog-detach.sh index bde05208ae6a..b699c2bb7c31 100755 --- a/t/t1413-reflog-detach.sh +++ b/t/t1413-reflog-detach.sh @@ -7,8 +7,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh reset_state () { - git checkout main && - cp saved_reflog .git/logs/HEAD + rm -rf .git && tar -xf .git-saved.tar } test_expect_success setup ' @@ -17,7 +16,7 @@ test_expect_success setup ' git branch side && test_tick && git commit --allow-empty -m second && - cat .git/logs/HEAD >saved_reflog + tar -cf .git-saved.tar .git ' test_expect_success baseline ' From patchwork Mon Apr 19 10:52:51 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: 12211429 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 2E362C433ED for ; Mon, 19 Apr 2021 10:53:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B07261166 for ; Mon, 19 Apr 2021 10:53:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238299AbhDSKxn (ORCPT ); Mon, 19 Apr 2021 06:53:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237578AbhDSKxj (ORCPT ); Mon, 19 Apr 2021 06:53:39 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C84BC061760 for ; Mon, 19 Apr 2021 03:53:09 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id u5-20020a7bcb050000b029010e9316b9d5so17790911wmj.2 for ; Mon, 19 Apr 2021 03:53:09 -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=GINUYoeKtVZX7Ae2Vsi9H9ikU3XWyESu7g709miUeWI=; b=tt1FYmrURmdt8gIc+LEQ/TVnx42c8NGGgR2YZJAS1CZT6t52CL82dczc/9ax4DLVSI hB4EbgP7UlZKFRK8BSqevzHXq6Tit4KBz6sO3GZbdMiajlCTXjo6s1bV71+TZc7J+jRn XWY4G7WNAehk+1xmMaBmRj+LvFmSGpBeGM/9wMno+EqwPCA9OSSPpnkPuIVqvEZt7Z2m wVM+3mjdYVRmuJpMfc8qq734iuNQUnk7cQWtFLzWdaQxniAVR3EStrk4ch9aIn97WSxK DfvqaLdB5btPhB7jNhRSUz9JU2l7sl/PD81h+XbrHTBTiDniGy3ATjhpaGjrSvslZk/R qWjQ== 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=GINUYoeKtVZX7Ae2Vsi9H9ikU3XWyESu7g709miUeWI=; b=cwdic5/yFLaXzG4jL7bdfAbZ2+xkMjwkxt3wkeZFFrNj6LwZHastxFxqA72O2+cU8N w/09/N2XeK2Dg3ZaqKUH8s+mp58IihgyZVeyqiaurUVP9zMXHlWiVJasJw8NMyWoD8V1 tY1z+b53bsT3snfbYgEuMezNh/t7WNBpHokjKi04+PeJG3NxU/rFkZxiQ4HZsea7pT9p 83neDQmR/UuhitiDQdYNJEKEXMd2zC6YHeBNUY/Qkzp5utHJ1gO3PY7wMSgX/lz7XyFx W2ra572C949EeVzff2DEO+S97agMDcecELIUh3yvUP+6W+cI/Wx632n9llozqgugGYUh L0vg== X-Gm-Message-State: AOAM530kmVEDKo3TECcEmeZiu0ilT5Bpj29EnLn+TfciU4Nlcw9d87PJ CBaylZmvHCZUkFjTuG2TjTcg8VSrtJs= X-Google-Smtp-Source: ABdhPJzXIaPHR1A5WCNU3VMffT0LS/VFGMIEiXehx/78bXAhFNZDjmgcR4j62kow3ood3k2ONCqS3A== X-Received: by 2002:a1c:6a01:: with SMTP id f1mr20990695wmc.144.1618829587972; Mon, 19 Apr 2021 03:53:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a15sm21680873wrr.53.2021.04.19.03.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:07 -0700 (PDT) Message-Id: <70da8f5631d024c2a940a1f0b888fa1c467207a2.1618829583.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:51 +0000 Subject: [PATCH 06/18] t1301: fix typo in error message 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/t1301-shared-repo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index ac947bff9fcf..84bf1970d8bf 100755 --- a/t/t1301-shared-repo.sh +++ b/t/t1301-shared-repo.sh @@ -124,7 +124,7 @@ test_expect_success POSIXPERM 'git reflog expire honors core.sharedRepository' ' : happy ;; *) - echo Ooops, .git/logs/refs/heads/main is not 0662 [$actual] + echo Ooops, .git/logs/refs/heads/main is not 066x [$actual] false ;; esac From patchwork Mon Apr 19 10:52:52 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: 12211433 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 A5B05C433ED for ; Mon, 19 Apr 2021 10:53:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 878D66101E for ; Mon, 19 Apr 2021 10:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238403AbhDSKxq (ORCPT ); Mon, 19 Apr 2021 06:53:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237751AbhDSKxj (ORCPT ); Mon, 19 Apr 2021 06:53:39 -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 D0429C06174A for ; Mon, 19 Apr 2021 03:53:09 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id w4so29781923wrt.5 for ; Mon, 19 Apr 2021 03:53:09 -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=5xliBb1w9QcuJ0w9pHRU1bxZSrBpjJ7XjtqqWTLT3aM=; b=gGjXRH5P1Kt9pf6GObmvOL/z50LpN0pB8yEOYCe5bnnkSoyE+bUG7WPTWVfhcMmux8 9YdiXQ2B/ZiGntAA0NLYzKRBE4mqPXusg8eaDUs4Gb5ENeZMGV7MaJ538KlnaFkE9qSb ujf+4FEFmW0A5V5Wq5yEM6mvX+lAQSzaUvBT9fFrifKNA2/HjbOw+w3N5fCF5HKdABSo RFI/D81lZAHt7KcEHjl24acNDqSGyHnUeuSZXlHbHWASRLT7ECA6etqbkiDjT2o/K7ur zSxwESUgo6aynrHAdQDU6SZWTt3uwVC9sHNTrmZzcYdkFPJLgtLaL2G9IP42lD9obY+Y WX9g== 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=5xliBb1w9QcuJ0w9pHRU1bxZSrBpjJ7XjtqqWTLT3aM=; b=N6Sst2cl9A3h+fJtQJWTSF1DXayYZOKIAMmzxnPa1+DcO8RwWmPJGgaYtUpml5pko+ Z1DuTcsp2Us6efAOP3xbfP94K8zHC1+MaT7dkIfmWopM7WKRFgVLahWH1ezpTpXQqBPg oFd8zdLODQ2ZElkbBmdngOhClh11BpO9/eKAkaG6MQCqAZWT9La4Z9rl2ThQPUunDUxc 5aggc48yzqbMhbd/h5N4K8IVtSVPue+5UtFYfXAkfi4aDsHT5MXgpw21cLWK5tHuPLYN NzSV/3A4ru5y5i+eA9fY9uGymOB62UAy21ZAWnSAHitBWMOxEPzhZ7VPlW+CAkYuhfoj QOZA== X-Gm-Message-State: AOAM533hAv3Rzi3KwsFZz4QmlKd19RproG3SR+wcDPEWOGofwI/FD+ms CzvTHWIZhISp/ozsyfGVRDjh8zsu6VM= X-Google-Smtp-Source: ABdhPJzx/j6q4cx6PaKXsBZkWgwqPhtcJT2f3w1KyGtwpd23myZXHRML+zsNR8jSSpHhnBCkyJybQw== X-Received: by 2002:a5d:6e06:: with SMTP id h6mr13684787wrz.201.1618829588687; Mon, 19 Apr 2021 03:53:08 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c6sm43171414wmr.0.2021.04.19.03.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:08 -0700 (PDT) Message-Id: <79843c0d572765a3004968235391b5ae17365d56.1618829583.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:52 +0000 Subject: [PATCH 07/18] t5000: inspect HEAD using git-rev-parse 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/t5000-tar-tree.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 7204799a0b52..472fec4ee64a 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -233,9 +233,10 @@ test_expect_success \ test_cmp expected.mtime b.mtime' test_expect_success \ - 'git get-tar-commit-id' \ - 'git get-tar-commit-id b.commitid && - test_cmp .git/$(git symbolic-ref HEAD) b.commitid' + 'git get-tar-commit-id' \ + 'git get-tar-commit-id actual && + git rev-parse HEAD > expect && + test_cmp expect actual' test_expect_success 'git archive with --output, override inferred format' ' git archive --format=tar --output=d4.zip HEAD && From patchwork Mon Apr 19 10:52:53 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: 12211437 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 9A58EC433ED for ; Mon, 19 Apr 2021 10:53:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 76EA661077 for ; Mon, 19 Apr 2021 10:53:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238544AbhDSKxw (ORCPT ); Mon, 19 Apr 2021 06:53:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237833AbhDSKxj (ORCPT ); Mon, 19 Apr 2021 06:53:39 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 525D9C06138B for ; Mon, 19 Apr 2021 03:53:10 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id k26so17086571wrc.8 for ; Mon, 19 Apr 2021 03:53:10 -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=X0PzUSzC+SRtK99yWFnIg18G/Wq5vdZArXandSlRw4g=; b=ePWx/YFYhMZNf9mdCz6Nm7iKtTMXNYh53edORNUXhFLjfL2RdSAxJoSE0kZs/B0jxR KOMG8cjXQ+WWkI682DhEFn1ci/XQ83y29bZc0REO9SWTWqbCtV2DZ/YYmNu/7Wcirhdw gMWZCBepSCvKerdGekras3JxGwjrHERxl/Ij3bDyVoRA4Y4+8RJLL7sXzJsw2xhuVcBI xs2uS4GsqjYPPJj4NPTOX7T+Q8YnwsmRM/udvCKpoC/UzsaTeF7x6dq0hlMa3n5T1QTg 9TcwREfImLoQcopa2dKWwYon97OeiiWpI+mlxpaQIWpQ72xrNPt7yD0roNZchCoWZZcX 7Eyg== 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=X0PzUSzC+SRtK99yWFnIg18G/Wq5vdZArXandSlRw4g=; b=G1UowMllfsktHZbsXROwzeajqyufs895o8MlMZYf6M+on5MoNNsqy8AputgJyEMHPm IolIdjz5A0VWwW9wL4Dih2VnT8CzACPAvRdn5Zkj6oBqS0KcX8e7DcVufC8rUYxivUFn kzwk8xwUmkc3iadgsHxWTzpfShJWqa0Eux9+lYibUKpmJA56+gk7nVD8kfjMwRYkuYiS mM8Gfbp5/4okDqtMSODDRHtxZQH62+vIuGrPiu5SWln7c1V528eDXjLyFTB7+2E2dAq9 PHmw5aIgEjoZWliArZKdPJyRWltrhOAp7HzDxac6LV0wwzcfcQNQsLJ/d2NAYhDv4ky/ 5ITQ== X-Gm-Message-State: AOAM5300Mo1EWtqFqOV5fR58p2746GFORmM81q+rk3FMYHVuGhihoHw7 8s3uJDGI6QT5ZdJ59LjqePSHyJnqNz4= X-Google-Smtp-Source: ABdhPJzE5qxwUWSZs0tCKX0sUL51iV34GbxRiYLiy+u39kRwj0MVS4hvhDRnhX4RCfgacwB5zdPOCA== X-Received: by 2002:a5d:69ca:: with SMTP id s10mr13541275wrw.78.1618829589191; Mon, 19 Apr 2021 03:53:09 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 61sm23798884wrm.52.2021.04.19.03.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:08 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:53 +0000 Subject: [PATCH 08/18] t7003: use rev-parse rather than FS inspection 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/t7003-filter-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 1349e5b2321c..cf30055c88dd 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -395,7 +395,7 @@ test_expect_success '--prune-empty is able to prune root commit' ' test_expect_success '--prune-empty is able to prune entire branch' ' git branch prune-entire B && git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire && - test_path_is_missing .git/refs/heads/prune-entire && + test_must_fail git rev-parse refs/heads/prune-entire && test_must_fail git reflog exists refs/heads/prune-entire ' From patchwork Mon Apr 19 10:52:54 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: 12211435 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 37777C433B4 for ; Mon, 19 Apr 2021 10:53:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FEA56101E for ; Mon, 19 Apr 2021 10:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238488AbhDSKxt (ORCPT ); Mon, 19 Apr 2021 06:53:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237914AbhDSKxk (ORCPT ); Mon, 19 Apr 2021 06:53:40 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA813C061760 for ; Mon, 19 Apr 2021 03:53:10 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id o9-20020a1c41090000b029012c8dac9d47so10895783wma.1 for ; Mon, 19 Apr 2021 03:53:10 -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=RPC/m9AGV7dxWKt5uG6CtdfLUgvEBWEG+qVhhHArvW8=; b=vH26Xpy221X/9ov2ANsCxETmz96MT5tTTWrcSwOSAbDLs9N2SpXDEGH3rZriFuMCOT /l8tSmYX5QMYMBKYqBZZfOp++JguALxyp7nO7pcsJtmAo/iiE+e86tggQpHPdad4UFLF NwRLWwA9TUUqM/PKp4D+BECQAFweJ+8jsnYvYMHldD7NEPs0F+9qLfNzeJtJgqmsSuqZ /5hFhqrqmWkgV0NLShpmApw1bC3hDCoshN9G1b2o4Fsh+tf6jtxvs7x1D62EYlhi+sgU YBPOJYzA80EoSABzZIoZXx8OIQmgOcZqn2/IegOHRLNzU4QqmaNXri1lzFCjqJNl8xnt KwtA== 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=RPC/m9AGV7dxWKt5uG6CtdfLUgvEBWEG+qVhhHArvW8=; b=J5tIWulRs8c+lNHse6uTVfShutNNRPl4ylH4p3LeQx3qYv85bq/3MZhAXVMJ8Vw5Xn 08XScyz1KO6n740b0tZR1w1eqbLP+4LgIWQOaL3tasLuM4xMlxuSpZhuPSHsFRohcFrd cVkOGVk7Xt0H5rQVshizwJHG5gbpxtQ//UfKk+/38PMNifc+dEPEI+a+qH3GyrhTWTI6 QG6JmeCHSDSmNCwCLaZca+YRbVy3ofxhO6aevvfsp0zJ2r8GzMvMH/274plhNP4PLiCc Sz8HId6yPMsx0SMCIoOFrb5v1RKhMDBfIbvLZIPjXMQK69JF81s8wr1172CG3rTC2VUB Zmkg== X-Gm-Message-State: AOAM532zymonpJU1YQhvqzFhxFsihnYHCnlcJY4WIbF2BlWISCUO5PWZ 9BNKeLfp331ecPZVh1B66GAc+9VsOrk= X-Google-Smtp-Source: ABdhPJzIfLZ2FM3da9h9UoXQ3I8+sh7e9/Olxf36Kcn7ABKW0azhNHFNOFsx3/o4H5gr/F7K51QCFw== X-Received: by 2002:a7b:ce1a:: with SMTP id m26mr21049568wmc.137.1618829589675; Mon, 19 Apr 2021 03:53:09 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id h10sm7915556wrt.40.2021.04.19.03.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:09 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:54 +0000 Subject: [PATCH 09/18] t5304: use "reflog expire --all" to clear the reflog 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 is more explicit, and reduces the depency between test functions. It also is more amenable to use with reftable, which has no concept of (non)existence of a reflog Signed-off-by: Han-Wen Nienhuys --- t/t5304-prune.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index b447ce56a9b2..4ffc0076801e 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -94,26 +94,22 @@ test_expect_success 'prune: prune nonsense parameters' ' ' test_expect_success 'prune: prune unreachable heads' ' - git config core.logAllRefUpdates false && - mv .git/logs .git/logs.old && : > file2 && git add file2 && git commit -m temporary && tmp_head=$(git rev-list -1 HEAD) && git reset HEAD^ && + git reflog expire --all && git prune && test_must_fail git reset $tmp_head -- - ' test_expect_success 'prune: do not prune detached HEAD with no reflog' ' git checkout --detach --quiet && git commit --allow-empty -m "detached commit" && - # verify that there is no reflogs - # (should be removed and disabled by previous test) - test_path_is_missing .git/logs && + git reflog expire --all && git prune -n >prune_actual && test_must_be_empty prune_actual @@ -123,6 +119,7 @@ test_expect_success 'prune: prune former HEAD after checking out branch' ' head_oid=$(git rev-parse HEAD) && git checkout --quiet main && + git reflog expire --all && git prune -v >prune_actual && grep "$head_oid" prune_actual From patchwork Mon Apr 19 10:52:55 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: 12211439 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 AC22AC433B4 for ; Mon, 19 Apr 2021 10:53:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 88BC261157 for ; Mon, 19 Apr 2021 10:53:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234399AbhDSKyO (ORCPT ); Mon, 19 Apr 2021 06:54:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237990AbhDSKxl (ORCPT ); Mon, 19 Apr 2021 06:53:41 -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 59CDFC061761 for ; Mon, 19 Apr 2021 03:53:11 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id m9so20750055wrx.3 for ; Mon, 19 Apr 2021 03:53:11 -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=1yBKFOdcU2Ihnf+bWAJn2pIcKIYMfcV4oCmsLTWM44o=; b=QvEPMo5qmLWAnBPKtWs+FkufhM8MlbESOKJeqBb9m6BcduYZz5DbWjx1qW4cTX8gjL XkfNNAJVmzxi3v6iKjW4wxr8S+grp0toUz3vXVbllcwgjJZ9kQIAaSvPealyIps/cVu/ cIhEYUumrKlt9yf6NbRTI3/rzIt9kCdne4HAY5LErAY6IlnfsO4Ff93736K7t0Ge7zZY tiFNBWB3nX8fdUNPBX9wRNEUbHv5EZuGgU/RHszhjIt8fcmX271gap+3+/Vx+qtfHCtT hr0Zs+WwR4Ur0GG3/lOadwyzG91/Y+4PyhFPLIFSW8ia6PYRkPso57OWslwNHP7kfhma iCsw== 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=1yBKFOdcU2Ihnf+bWAJn2pIcKIYMfcV4oCmsLTWM44o=; b=a+KragHt6kVb5VM+rtcaNEGoEJHc45z9CDRiTIs21vKf4B1FgX0Idei4eX43G7cu0G Qx9bFsA3vxDcVhvau1M0r9/FgKfX/lIiIO1qLznM9lThuOIy77ScjjQ6+fWwYeOV64d0 cU5LWB1ZJor4n2TB9EIXEPRxJux1vauUpQM0y4DO1SpahJqAxse5zU+OBc75foLQ/BXX yJ2jO6aaTLDNJ5WekJi9cwhmDVJS6fHWYjPPmLuVAPavckUWLP0LHkXFrcERB3igbxy7 e+dV3YIzAAZKNk9bGBqE/IiLfF1gZNIxe5Kwd2J+ZtdCg8Yv4OBQJ4EpNwi+cM7ehtSo sQPg== X-Gm-Message-State: AOAM530/uAPkTdItDd0lnvcEfIDMlDKOX2AcsvDcIhOWbo2cgHtPjqDw 9QA7gOZ+YfFz8DEsH8lgpX2pu5ePUxA= X-Google-Smtp-Source: ABdhPJyyNzb/Mwc8wKjzbHf/w/RSA+LHOsZQQ7R8DZe5m1Lj406h9KDrqG3RDQtZ8qkGl1Feb5TbGw== X-Received: by 2002:adf:8046:: with SMTP id 64mr13600979wrk.176.1618829590213; Mon, 19 Apr 2021 03:53:10 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u11sm13874547wrt.72.2021.04.19.03.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:09 -0700 (PDT) Message-Id: <3d3b733c31273a004e80d5cbab8f746a2010e9ea.1618829583.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:55 +0000 Subject: [PATCH 10/18] test-lib: provide test prereq 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 REFFILES can be used to mark tests that are specific to the packed/loose ref storage format and its limitations. Marking such tests is a preparation for introducing the reftable storage backend. Signed-off-by: Han-Wen Nienhuys --- t/test-lib.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/test-lib.sh b/t/test-lib.sh index d3f6af6a6545..ea7397c633db 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1481,6 +1481,8 @@ parisc* | hppa*) ;; esac +test_set_prereq REFFILES + ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 test -z "$NO_PERL" && test_set_prereq PERL test -z "$NO_PTHREADS" && test_set_prereq PTHREADS From patchwork Mon Apr 19 10:52:56 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: 12211443 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 0D96CC433B4 for ; Mon, 19 Apr 2021 10:53:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DF96B61077 for ; Mon, 19 Apr 2021 10:53:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233722AbhDSKyU (ORCPT ); Mon, 19 Apr 2021 06:54:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238204AbhDSKxm (ORCPT ); Mon, 19 Apr 2021 06:53:42 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCCCAC06174A for ; Mon, 19 Apr 2021 03:53:11 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id m9so20750091wrx.3 for ; Mon, 19 Apr 2021 03:53:11 -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=niVOFwUquJjmjDMBiQ//lZeh5gDuJbzhhIeA7vutwVo=; b=hc+nhSEirpqTS/9h29DEonodsjMxRo+OQdUFzENMGVU/LVFcYpXJr83QKSSVuIp9lk lQ6KoYIHd16586uuU0GyAQ/W81DQYrKNtcmcg/ntacPH0j7uNlK1BwooDRrvTruvXuwz LfMkFVEplP2J0LnEN+lV+/jgOmAkao5JUn2cy4ftUXtvp8KPX1/0pJ8WvFD9DV/83keO Shd5axUT2Y/unQmMvgVG4U8l9UK455b6upXM0cBfYOqtQr83sdpUNUTYGIQO0JqfC65P Yogao+/6SAamSY2LKK8LTf+OlphzLt5ijWkFSW0M0WcUod+s084xRxHqrDV365ATT4jg 1/kQ== 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=niVOFwUquJjmjDMBiQ//lZeh5gDuJbzhhIeA7vutwVo=; b=fjiGjqXEBxZy9Ro/UZXoWXkShqQ8oG+mpwOIyzZi/VzKzwWdavgyMuEUzGgZfKA7Zz 8zb7r7WyJBMaNtHrF0bMAGYlv1AwlU5aIKLgwMNUNRLRlZ8zJgTbNIrn7VEH+3GX6dvw FlQHlHscUkPJ6pIiSn1qYxGBY1VpZ6DaTY5s4jJCr+tXkgspKMbViFqXZob8mT6rMkl4 4IAjY5B7wUMViVhW89CaW27gsl8OnaQQg/ikaowgukBnRv33HuHQgMankS5EFpgMrO/b nXE+dz9HyYftxsA1mcBXa0bl/yTR5yHcuIrEYD/P228f3mgbpwzcGBFakX83xorq+Xxb N9gA== X-Gm-Message-State: AOAM532uatI8HFzWrCUuZQ+eVSpmGty8/bp/pt5rGuIg6eX317qzPL8E 5aVHYeNY2AtpvV4JFfLS9vShoB8nWik= X-Google-Smtp-Source: ABdhPJwB/Xz+EEqQ+5WgV0m03KpoXJTcvfPSklf8vhSZOtut/QH4Inr/HjP3DC7GLTuNzUIHBDj+Eg== X-Received: by 2002:adf:dbc2:: with SMTP id e2mr12681113wrj.398.1618829590701; Mon, 19 Apr 2021 03:53:10 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 66sm22838241wmb.36.2021.04.19.03.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:10 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:56 +0000 Subject: [PATCH 11/18] t1407: require REFFILES for for_each_reflog test 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 It tries to setup a reflog by catting to .git/logs/ Signed-off-by: Han-Wen Nienhuys --- t/t1407-worktree-ref-store.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-ref-store.sh index d3fe77751122..27b57f248a94 100755 --- a/t/t1407-worktree-ref-store.sh +++ b/t/t1407-worktree-ref-store.sh @@ -52,7 +52,7 @@ test_expect_success 'create_symref(FOO, refs/heads/main)' ' test_cmp expected actual ' -test_expect_success 'for_each_reflog()' ' +test_expect_success REFFILES 'for_each_reflog()' ' echo $ZERO_OID > .git/logs/PSEUDO-MAIN && mkdir -p .git/logs/refs/bisect && echo $ZERO_OID > .git/logs/refs/bisect/random && From patchwork Mon Apr 19 10:52:57 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: 12211441 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 59F80C43461 for ; Mon, 19 Apr 2021 10:53:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3A3FC61077 for ; Mon, 19 Apr 2021 10:53:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238678AbhDSKyR (ORCPT ); Mon, 19 Apr 2021 06:54:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238135AbhDSKxm (ORCPT ); Mon, 19 Apr 2021 06:53:42 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DE4BC06138A for ; Mon, 19 Apr 2021 03:53:12 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id y204so16519731wmg.2 for ; Mon, 19 Apr 2021 03:53:12 -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=wod2A27fy11LyRODnuCxhNiKLVgYgInfwpEit4Of9S0=; b=sYCcJtriNxSWDpXbnaCuDDFJxL1Q0bxqiHa8UMxqe418PWJXJknwwUF0djozMNETDP Oj3J88UWtZSqWE56co57gPb5uvtlAQjdP2B2MbmdW0Jf5Yg0byaSwW6QaF6Gc+1K8NU2 YFE5a5oR70XlE7fW3YntE1lDmlAwloBfsaGwF40ylDM6B8LRXN9TC18N0PwttpNE2WaP OxaQNyWBLQc/nzXIEcq0oySckOOAEMQaA7tY/oCGji4ET4BVApxT09v/Cj8CzwIzB0SQ 2qZQTp2wlEuTkPCkH8M19DMOJ75v0spO/lsQ5tSagNULXkRvj35TrPRF/IZWmrEQ7TDi a9DA== 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=wod2A27fy11LyRODnuCxhNiKLVgYgInfwpEit4Of9S0=; b=Kl84pzm2IHRoEYDCIqWVO5fPOyj4odpiepcE0Pyj9mXqZ8nwjBhXyDTNN6tuNOaYBF x7Xn/3O3YWpIFTnQubdPNoN9yFHHlVfnsLVhwX8t1FmOnq/XCNLVySA3E2qnE+6OuGfq GpBjAZ63zIhcZ0YdJwKsQQxQ7A8a2jJCanuz3TWZGbEdGEt1QwgKy1EBR605Hz1gFZ/A tmkkBFoXqay7mhkUOjWQsboR42o86+xSP3SmpbH51YTm5RM9Q6pw3i/BO1PjDVNwNWyu EBqtbXIF/HhX4ilo8wqKRJHDmXOcZdANXnEB1ApEFNP4ag/qjZksDCKuj/s9yc9+3NS9 t3gw== X-Gm-Message-State: AOAM531jsgc8OL2Gtqg0B4E4Iaw4cq75LlXVunsecT+VMFFcss4shjGx oGs3ZjGJOLhkJmh9HoDtf/eF6dE88Rw= X-Google-Smtp-Source: ABdhPJxIMsDcSLpB6AYRrhG1Rq4N9GjhFFBBDqbBbkq/DcKDwxnpOTWFsG6TIhxiejIqFCZKR144Dw== X-Received: by 2002:a1c:64c4:: with SMTP id y187mr20832743wmb.162.1618829591224; Mon, 19 Apr 2021 03:53:11 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q7sm9838079wrr.62.2021.04.19.03.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:10 -0700 (PDT) Message-Id: <86951eb39cb65d4928cf03964afc28e06e1f9166.1618829583.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:57 +0000 Subject: [PATCH 12/18] t1414: mark corruption test with 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 reftable format guarantees that reflog entries are well-formed Signed-off-by: Han-Wen Nienhuys --- t/t1414-reflog-walk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1414-reflog-walk.sh b/t/t1414-reflog-walk.sh index 80d94704d012..72a5ac61a520 100755 --- a/t/t1414-reflog-walk.sh +++ b/t/t1414-reflog-walk.sh @@ -119,7 +119,7 @@ test_expect_success 'min/max age uses entry date to limit' ' test_cmp expect actual ' -test_expect_success 'walk prefers reflog to ref tip' ' +test_expect_success REFFILES 'walk prefers reflog to ref tip' ' head=$(git rev-parse HEAD) && one=$(git rev-parse one) && ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" && From patchwork Mon Apr 19 10:52:58 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: 12211445 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 1948DC433ED for ; Mon, 19 Apr 2021 10:54:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC9886101E for ; Mon, 19 Apr 2021 10:54:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231998AbhDSKyz (ORCPT ); Mon, 19 Apr 2021 06:54:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238028AbhDSKxp (ORCPT ); Mon, 19 Apr 2021 06:53:45 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08C24C06138D for ; Mon, 19 Apr 2021 03:53:13 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id o9-20020a1c41090000b029012c8dac9d47so10895853wma.1 for ; Mon, 19 Apr 2021 03:53:12 -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=algQ1aErS+lLlLPZ3mA8qMJLPQJXrWgJAe1xDKA+riI=; b=SKkSB5GghWA9BWrBAVhkgj6lsphW8oZO8J0H8KPt6+HHcvBpB+ri6hmhPQUKkcqjwh y5MBnYRtuYexmLh+ZLuyBGiZQo08jTXNm86NNmF8367JkbSoTreHSw2ST8jzuqEk4eaq MWTtk5spMDo6DdjWq4A7B93j/AhUIfIxlVJxs4/9koK15+uR1yxcSQI9ClI7Cqn0Bps+ l7a0jf8TGcBmnbgzwqp3GmSIwdlDvrUzIRpp0+6IJOkv8FEdpt/MGbOFgcLP63Re9S9h Gs5+/HI8xZ8pF8z/UZMfhOkIrCJ9tI2n56hrQQyqFqXU3bGalhyaGvrgJIGVQ8ifBNSc o0NQ== 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=algQ1aErS+lLlLPZ3mA8qMJLPQJXrWgJAe1xDKA+riI=; b=A0/8AuwGH71u7cOrm3imA3WFsNkCBZOz45J/Heas7h9EIH/Gvh15NtMKR/IOlCry9V 7/Pg69MkTBT+IFIfMYJl7wuYBQgicZol/jgNkWrhYrxny6Q0VNMwYifoGmqDDeCODjkf qzTXJkLAGDgpZ2HSJm2SN1UevtWwj1X5ak85YxswfiL/ePvLEuHhrBWS6MLEdi0ve8+k SPh0lRR4gshLt/Kc9rDz7MDhrAKi59PImODSeTE29i+8JwyWjGyPTSphx7GXqhBgO6bO pXtp4RaIGTcj3D0GL+2eQH7tIXT/wSDk27yvGCjB9B+6PnfbHUWVBnF+v1a6RYV7/Uii mfvg== X-Gm-Message-State: AOAM533w8/oKXcOp8NoVy41nxBjpUari70ey0HprR0i9RO2w9PtTfi2W +mDdBPaIgLVbc9Bh9tLytlG9n7XbwxI= X-Google-Smtp-Source: ABdhPJyzDcSIdkdVKFrjAQKgaDRozP418SIopRy4jQFSxWswa8ASaK0rbco+HsNlcYuEtZ/aXRSV8w== X-Received: by 2002:a1c:9850:: with SMTP id a77mr20387638wme.174.1618829591740; Mon, 19 Apr 2021 03:53:11 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i15sm23023260wru.12.2021.04.19.03.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:11 -0700 (PDT) Message-Id: <1ce545043846ee06070d1a4bc05fcd5221847eab.1618829583.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:58 +0000 Subject: [PATCH 13/18] t2017: mark --orphan/logAllRefUpdates=false 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, there is no notion of a per-ref 'existence' of a reflog. Each reflog entry has its own key, so it is not possible to distinguish between {reflog doesn't exist,reflog exists but is empty}. This makes the logic in log_ref_setup() (file refs/files-backend.c), which depends on the existence of the reflog file infeasible. Signed-off-by: Han-Wen Nienhuys --- t/t2017-checkout-orphan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t2017-checkout-orphan.sh b/t/t2017-checkout-orphan.sh index c7adbdd39ab9..88d6992a5e1f 100755 --- a/t/t2017-checkout-orphan.sh +++ b/t/t2017-checkout-orphan.sh @@ -76,7 +76,7 @@ test_expect_success '--orphan makes reflog by default' ' git rev-parse --verify delta@{0} ' -test_expect_success '--orphan does not make reflog when core.logAllRefUpdates = false' ' +test_expect_success REFFILES '--orphan does not make reflog when core.logAllRefUpdates = false' ' git checkout main && git config core.logAllRefUpdates false && git checkout --orphan epsilon && From patchwork Mon Apr 19 10:52:59 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: 12211451 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 14566C433ED for ; Mon, 19 Apr 2021 10:54:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D63F761166 for ; Mon, 19 Apr 2021 10:54:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233695AbhDSKy6 (ORCPT ); Mon, 19 Apr 2021 06:54:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238194AbhDSKxq (ORCPT ); Mon, 19 Apr 2021 06:53:46 -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 78999C06138E for ; Mon, 19 Apr 2021 03:53:13 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id w4so29782103wrt.5 for ; Mon, 19 Apr 2021 03:53:13 -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=cJBNVo4/7xaNwI7HkTYVfC2QG9mtSrqhCWXilZ5Qaws=; b=igkTX281PMC+NB6qEDCdRzXCsT4RhNw2RPL6Oy+3lFqbHh1j7I5QryYO1WkY0PrCjj AyJil+X3T+sE5Mlqmqtnj6VSonFa6Rrl+pryhyTDw27K/BQG1RRPWEkf9H7PPxEwFL9n 6Rz8vimw19di3hUdFHO4ARBHbCzbDNQNruMSfi3nhpXEwyQRaloIiqTRFNnjWqnu2iPb 9wYFmVp3eJoNYy4X4Q0XS5/UMdkOl53DxwjQjtJaNTqjLN0QoMf04SZDgHP1sADI92zq 5YfJK2q+4QGuiIflSOphGfSAwG7sRHgy6JZ/Nky0i3AfgAUJziKTzX7rUuDR4r5j8G8L 6u6g== 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=cJBNVo4/7xaNwI7HkTYVfC2QG9mtSrqhCWXilZ5Qaws=; b=Aw78slucrcfAG0AeQBKgMcC4F1zJUyHNTLoyOB3o7hVD8mbQae7zqv0dUl1hg8kgwa mSu/7BT8PfAI5GJisda54srn1duohKtdYLyWwCKYHm0ZoyyvW7x0lkO+AhyBJRvnCIcM vHvMaSS/hjYkkedS+K/L/1FZ8veHXLwMNAdxrYkhftMSbQ8++mpYldq2ie2oWvT/xS58 3tBhpbqXttTWT4+9VQEEdEIu+WLc/yPK7DAr1PnukBwyVRZUE57f3y0m4ZhtD0+fUlH4 8yhYta1cFZ5Mjf81QylL5+qxRRPIgRvWsnjM1SbDQ93jTwOuAB2wLA64tbOuV2TPcVij fIiw== X-Gm-Message-State: AOAM5331Obqtx5TMZIOpQ9ygnwAe6eoPY0O3bx5bovj+tflySjoCNL9K 3BcebsZOdIekK8dGDS+l1+vqJIv5Y40= X-Google-Smtp-Source: ABdhPJxlcgZIQct23vJQjg83SIpFgsSOsDZbBULcvtJ7RH/OPFrJSNdi/SW91mcFi7+MSMDX16srFQ== X-Received: by 2002:a5d:66cf:: with SMTP id k15mr13929282wrw.404.1618829592275; Mon, 19 Apr 2021 03:53:12 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y8sm7426388wru.27.2021.04.19.03.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:12 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 19 Apr 2021 10:52:59 +0000 Subject: [PATCH 14/18] t1404: mark tests that muck with .git directly 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/t1404-update-ref-errors.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh index 8b51c4efc135..b729c1f48030 100755 --- a/t/t1404-update-ref-errors.sh +++ b/t/t1404-update-ref-errors.sh @@ -189,7 +189,7 @@ test_expect_success 'one new ref is a simple prefix of another' ' ' -test_expect_success 'empty directory should not fool rev-parse' ' +test_expect_success REFFILES 'empty directory should not fool rev-parse' ' prefix=refs/e-rev-parse && git update-ref $prefix/foo $C && git pack-refs --all && @@ -199,7 +199,7 @@ test_expect_success 'empty directory should not fool rev-parse' ' test_cmp expected actual ' -test_expect_success 'empty directory should not fool for-each-ref' ' +test_expect_success REFFILES 'empty directory should not fool for-each-ref' ' prefix=refs/e-for-each-ref && git update-ref $prefix/foo $C && git for-each-ref $prefix >expected && @@ -209,14 +209,14 @@ test_expect_success 'empty directory should not fool for-each-ref' ' test_cmp expected actual ' -test_expect_success 'empty directory should not fool create' ' +test_expect_success REFFILES 'empty directory should not fool create' ' prefix=refs/e-create && mkdir -p .git/$prefix/foo/bar/baz && printf "create %s $C\n" $prefix/foo | git update-ref --stdin ' -test_expect_success 'empty directory should not fool verify' ' +test_expect_success REFFILES 'empty directory should not fool verify' ' prefix=refs/e-verify && git update-ref $prefix/foo $C && git pack-refs --all && @@ -225,7 +225,7 @@ test_expect_success 'empty directory should not fool verify' ' git update-ref --stdin ' -test_expect_success 'empty directory should not fool 1-arg update' ' +test_expect_success REFFILES 'empty directory should not fool 1-arg update' ' prefix=refs/e-update-1 && git update-ref $prefix/foo $C && git pack-refs --all && @@ -234,7 +234,7 @@ test_expect_success 'empty directory should not fool 1-arg update' ' git update-ref --stdin ' -test_expect_success 'empty directory should not fool 2-arg update' ' +test_expect_success REFFILES 'empty directory should not fool 2-arg update' ' prefix=refs/e-update-2 && git update-ref $prefix/foo $C && git pack-refs --all && @@ -243,7 +243,7 @@ test_expect_success 'empty directory should not fool 2-arg update' ' git update-ref --stdin ' -test_expect_success 'empty directory should not fool 0-arg delete' ' +test_expect_success REFFILES 'empty directory should not fool 0-arg delete' ' prefix=refs/e-delete-0 && git update-ref $prefix/foo $C && git pack-refs --all && @@ -252,7 +252,7 @@ test_expect_success 'empty directory should not fool 0-arg delete' ' git update-ref --stdin ' -test_expect_success 'empty directory should not fool 1-arg delete' ' +test_expect_success REFFILES 'empty directory should not fool 1-arg delete' ' prefix=refs/e-delete-1 && git update-ref $prefix/foo $C && git pack-refs --all && @@ -466,7 +466,7 @@ test_expect_success 'incorrect old value blocks indirect no-deref delete' ' test_cmp expected output.err ' -test_expect_success 'non-empty directory blocks create' ' +test_expect_success REFFILES 'non-empty directory blocks create' ' prefix=refs/ne-create && mkdir -p .git/$prefix/foo/bar && : >.git/$prefix/foo/bar/baz.lock && @@ -485,7 +485,7 @@ test_expect_success 'non-empty directory blocks create' ' test_cmp expected output.err ' -test_expect_success 'broken reference blocks create' ' +test_expect_success REFFILES 'broken reference blocks create' ' prefix=refs/broken-create && mkdir -p .git/$prefix && echo "gobbledigook" >.git/$prefix/foo && @@ -504,7 +504,7 @@ test_expect_success 'broken reference blocks create' ' test_cmp expected output.err ' -test_expect_success 'non-empty directory blocks indirect create' ' +test_expect_success REFFILES 'non-empty directory blocks indirect create' ' prefix=refs/ne-indirect-create && git symbolic-ref $prefix/symref $prefix/foo && mkdir -p .git/$prefix/foo/bar && @@ -524,7 +524,7 @@ test_expect_success 'non-empty directory blocks indirect create' ' test_cmp expected output.err ' -test_expect_success 'broken reference blocks indirect create' ' +test_expect_success REFFILES 'broken reference blocks indirect create' ' prefix=refs/broken-indirect-create && git symbolic-ref $prefix/symref $prefix/foo && echo "gobbledigook" >.git/$prefix/foo && @@ -543,7 +543,7 @@ test_expect_success 'broken reference blocks indirect create' ' test_cmp expected output.err ' -test_expect_success 'no bogus intermediate values during delete' ' +test_expect_success REFFILES 'no bogus intermediate values during delete' ' prefix=refs/slow-transaction && # Set up a reference with differing loose and packed versions: git update-ref $prefix/foo $C && @@ -600,7 +600,7 @@ test_expect_success 'no bogus intermediate values during delete' ' test_must_fail git rev-parse --verify --quiet $prefix/foo ' -test_expect_success 'delete fails cleanly if packed-refs file is locked' ' +test_expect_success REFFILES 'delete fails cleanly if packed-refs file is locked' ' prefix=refs/locked-packed-refs && # Set up a reference with differing loose and packed versions: git update-ref $prefix/foo $C && @@ -616,7 +616,7 @@ test_expect_success 'delete fails cleanly if packed-refs file is locked' ' test_cmp unchanged actual ' -test_expect_success 'delete fails cleanly if packed-refs.new write fails' ' +test_expect_success REFFILES 'delete fails cleanly if packed-refs.new write fails' ' # Setup and expectations are similar to the test above. prefix=refs/failed-packed-refs && git update-ref $prefix/foo $C && From patchwork Mon Apr 19 10:53:00 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: 12211447 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 32404C433B4 for ; Mon, 19 Apr 2021 10:54:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A60961157 for ; Mon, 19 Apr 2021 10:54:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233011AbhDSKy4 (ORCPT ); Mon, 19 Apr 2021 06:54:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237725AbhDSKxq (ORCPT ); Mon, 19 Apr 2021 06:53:46 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFA06C06138F for ; Mon, 19 Apr 2021 03:53:13 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id n4-20020a05600c4f84b029013151278decso6590018wmq.4 for ; Mon, 19 Apr 2021 03:53:13 -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=TJJnDxSxMEo+4PIzixl1CAqWxv6z9UWK4OY0vzo3ayE=; b=UolRvqn76Qs+wCCAa6Mp2qBVOfaJcx48xUpmplUFDLqFLq0QQHItgVn80ELQHShnQ/ tKEvWp0x/143tlKsAiAAtrumsoUDaK9gMRzigNlTQ1dE1L1IQ6QPWjtf0ipCfNTELGZb FRB2E5EpaktbF1JeYT0hGm26iyVsE6mnfmz+TmWeMMQjbboK8laHhdGPXi9IMXYwVpM3 7tpqUMz1PY6NVFUqujzeuq4wH6a3y9SLOBgcweZ+IcH4ZGWt9/u1UbINMB3eGakYN/MY 8yZdNj3dJ4xrOXd6QnGILoXRxqiFg2fLZ9mFr4oPGdrhFtpEibiZHpQFg/17PQdcR8KZ diAA== 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=TJJnDxSxMEo+4PIzixl1CAqWxv6z9UWK4OY0vzo3ayE=; b=LVRIb/yWSfHfK331Txdt3oL8KF03ufeQIiNjNloRenLsNtVnK9Bcp0s2ZEBNA4TbhR VL0co4aun5rIAp9w+9IiMf9kztP2M9Dhoar3P29i1IyY69WXXeTP54Re+hLKSgRVV8uO sy4Eu44Z9Hf61b2wHOBsfTOehyvKy4fKjnlML0vTBpPidBNR6APLBTh/eVc0sbg6TRRt ya5+EoKHl3mR3XwOdnxIgJhx/8jxRmSGVumn684JjhFJsnt2L9RAru3/38NCQUQb7gX6 3mGMAkvjajbgCr+Pgy5ccgAAXoXCabXU/gQthgfnsM7dZ+khqBzwcDIL0/O9UXByPidg 76GQ== X-Gm-Message-State: AOAM531rprl8fF6K2D760kq9fCDBQuD5OPs5sj7Z8AgAkVwWZYGmZMDt GAGloJ2OxmEpgZAmmTup8tRPUD3IKpE= X-Google-Smtp-Source: ABdhPJxtwFZe5XDNG8ZDg03s4EYVgrqCUYk3H1ROS6CElrLrH9xkh6jCf5lTZMz5OF+yKAAbRG5qWQ== X-Received: by 2002:a1c:e407:: with SMTP id b7mr20552893wmh.75.1618829592761; Mon, 19 Apr 2021 03:53:12 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f1sm17680650wru.60.2021.04.19.03.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:12 -0700 (PDT) Message-Id: <2b3021c4ba626033cde3b28dda7e5a83b85be2b1.1618829583.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:53:00 +0000 Subject: [PATCH 15/18] t7900: mark pack-refs tests 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/t7900-maintenance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 2412d8c5c006..6f2f55a6c51d 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -343,7 +343,7 @@ test_expect_success 'maintenance.incremental-repack.auto' ' test_subcommand git multi-pack-index write --no-progress X-Patchwork-Id: 12211449 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 6DA6EC433ED for ; Mon, 19 Apr 2021 10:54:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4963161157 for ; Mon, 19 Apr 2021 10:54:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234214AbhDSKy5 (ORCPT ); Mon, 19 Apr 2021 06:54:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238446AbhDSKxq (ORCPT ); Mon, 19 Apr 2021 06:53:46 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CA6DC061342 for ; Mon, 19 Apr 2021 03:53:14 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id k4-20020a7bc4040000b02901331d89fb83so5690453wmi.5 for ; Mon, 19 Apr 2021 03:53:14 -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=UQVnjhcNUk8a599g09NcER4MfyNVsn5mTMW/7v1P3qk=; b=X3AzV8uMcOp5xOAGzsccXH2L7GzdREzwUfw5AaaPXn2va3/EcKwMlzLHPWhVNpICnv OIefoOm9u8hKB9jIiPakRYC7Y0E6zkvMadKDxtZAgKEVlkuFI87tysQxAOKjK2pOElde Eid8Gv4/7I4vZfYR63U1YoLw3uTGmVTWKfM2FhncAksYqsB0Gmb5L3LyzbAG4z0KKUGY C5isMDIvcN7vqsWrAVO9VgZ583im3Q6Sdif4QIMxiOz8zDZZIPc3Yyjl2mPNCJZAcqCQ 4wFu73TFnME9nJN+govcsa7V+k0tjbwa+1DcX51Myr4wP4Xuu9UPzm6eQx47ZRlw1HAr aiyA== 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=UQVnjhcNUk8a599g09NcER4MfyNVsn5mTMW/7v1P3qk=; b=kWCO0/mzxbgy1nyf1NmUyWGEaRi/vbR768c0Kdhq7dBU0WlMYQvaoVAuYfYhk73P7y oIYk+SN++2zLjBsp9DgtHOXcSuJIsgmcDnaMiuqdO5T2aV7ostoDUYZUrYJemAgRyhnU jwjTJMLuKnzPo9vx44lwomY2GL9Arn1y4IDlIC55ArTJkPuPuFLCeVpt4KhzfWIE6EUL hSFYZRQ+H0ovrxPT7LEwLwZaKsFS9sBct9faT29dmCYlMKkedGOuJLMUcYYDQjVgEMdq zDkKVuCYPX+xcOSWCUqc3BIdJujFf4/Jl2iyFAXAwLOHASutHDrMRj6eYQR5YaEGikA6 1K9A== X-Gm-Message-State: AOAM533ELjsCD535Wz/uErbozA6URXK3CZTJ/ry4d7y9PUj+g1K6odUo LjggqXbegrGrYnWsQit9ceUycbr9S9c= X-Google-Smtp-Source: ABdhPJxuwLs/JJ9O+AoUhcD15AdRy31hp6TJklOaZ+gBoJatOEnRMfR0aG8Ft6iy6zlg8SVZuni8DA== X-Received: by 2002:a05:600c:220c:: with SMTP id z12mr20737817wml.92.1618829593220; Mon, 19 Apr 2021 03:53:13 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u2sm22146925wmm.5.2021.04.19.03.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:12 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 19 Apr 2021 10:53:01 +0000 Subject: [PATCH 16/18] t7003: check reflog existence only for 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/t7003-filter-branch.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index cf30055c88dd..380bdf934317 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -396,7 +396,9 @@ test_expect_success '--prune-empty is able to prune entire branch' ' git branch prune-entire B && git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire && test_must_fail git rev-parse refs/heads/prune-entire && - test_must_fail git reflog exists refs/heads/prune-entire + if test_have_prereq REFFILES ; then + test_must_fail git reflog exists refs/heads/prune-entire + fi ' test_expect_success '--remap-to-ancestor with filename filters' ' From patchwork Mon Apr 19 10:53:02 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: 12211453 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 001B9C433B4 for ; Mon, 19 Apr 2021 10:54:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1F9161077 for ; Mon, 19 Apr 2021 10:54:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229630AbhDSKzA (ORCPT ); Mon, 19 Apr 2021 06:55:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238534AbhDSKxv (ORCPT ); Mon, 19 Apr 2021 06:53:51 -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 D4218C061343 for ; Mon, 19 Apr 2021 03:53:14 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id z6so112741wmg.1 for ; Mon, 19 Apr 2021 03:53:14 -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=Dp8makdTS/NHjMfdBIkDs+dxCfZ8wwmWyjvTcQeCVEs=; b=GCOjwrCm7g7JKdo10iFJSv6ydH7MuYa1vMNHM6T8uIz1xQBX+U4ZJqgyMnwWiaWM9L JdCmK6ubfglRjoRR8/etAduY8FOSEndOcrGNt4HieQetXRufs9Nz48S3MHkiHMYFJmiQ jyeNEUeooUBIpsbV1l2YJ4SeJOc3gTK820y38xIK+tl1K1upXLrYwangd3gHv0ZLdIMd 2f1a3oYVcRe1Ysie7BqwWd1EvPB33VHc+pSL+/qu3e6Y3R8egjJdMG0O2Q++PgsPihgj yjBw10tGgyGOMZzNbzK+fGJ4qdXSY38f8nK2YlkScN3yOIUx7meFDAgezELeD2q3Ct/o gsYw== 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=Dp8makdTS/NHjMfdBIkDs+dxCfZ8wwmWyjvTcQeCVEs=; b=P79oDjQtVVu51NX7zdK6XWRlYXOMiuTGNJai2DhzQEYan2JnireXnd+aNzNX5gjSjc GjcFFQDjGCbVX8IT/kVDIP492ipgQBf5hjlUui0egR0ljgtye6469n25KuS2rD5rQgUl Qcsp3pDSuItkzOnknj6oQC3F5snDosIutBwOa/2x5+A9lP9kjEW6PixBufctglGKU9Y5 KMGpDPsT3qe3WtqfkD+zIKou0WbyOM12F5boPIEBFN7sZ1STyc6kOZnMllc3HiOcjbY9 ljvNYjsqppBZYfu8Y0+hH0G+eNSu70GsuoD4nZfuYZII+i3M6N7iEBK9vrovnzCzK9FF ARFQ== X-Gm-Message-State: AOAM532dCrVmwJ08r/tbnTfM4uIyVL2hTFMQpCD1HgzCZ0FD8d0yRn+C ooEKAbKzrLe2evUlIxQoEu/apx5d2no= X-Google-Smtp-Source: ABdhPJxkAdUe263V+UyjPP/BsvvuiCwEE+r/cQcVBzFhR47pppBYJRuaoHwT4bmiMJDr+dfFjZVubw== X-Received: by 2002:a05:600c:365a:: with SMTP id y26mr20398260wmq.102.1618829593718; Mon, 19 Apr 2021 03:53:13 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v2sm23134905wrr.26.2021.04.19.03.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:13 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 19 Apr 2021 10:53:02 +0000 Subject: [PATCH 17/18] t4202: mark bogus head hash test with 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, hashes are correctly formed by design Signed-off-by: Han-Wen Nienhuys --- t/t4202-log.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4202-log.sh b/t/t4202-log.sh index c575deaad4fb..ed6d4ecd3a28 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -1834,7 +1834,7 @@ test_expect_success 'log --graph --no-walk is forbidden' ' test_must_fail git log --graph --no-walk ' -test_expect_success 'log diagnoses bogus HEAD hash' ' +test_expect_success REFFILES 'log diagnoses bogus HEAD hash' ' git init empty && test_must_fail git -C empty log 2>stderr && test_i18ngrep does.not.have.any.commits stderr && From patchwork Mon Apr 19 10:53:03 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: 12211455 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 738EBC433ED for ; Mon, 19 Apr 2021 10:54:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E50A61077 for ; Mon, 19 Apr 2021 10:54:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237725AbhDSKzH (ORCPT ); Mon, 19 Apr 2021 06:55:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238516AbhDSKxv (ORCPT ); Mon, 19 Apr 2021 06:53:51 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FB57C061344 for ; Mon, 19 Apr 2021 03:53:15 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id t14-20020a05600c198eb029012eeb3edfaeso7940189wmq.2 for ; Mon, 19 Apr 2021 03:53:15 -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=YvmYr9/bofH492YlD9AmNRB09EovSBOYsEeqrELZews=; b=uuI9csGz9emqkPhSgQ9J/S3J/qHspTxNGjvhDKyeZZ5JaQhU+YeXyuTU0Og2jiH+LR d9O8/DJlf4VE/ghgX/tkMtvCVA5p4f0ycVWy2M6p6HdfGwC4yQ+d2QAeLfDJlVvECAp3 ojEUcrv6kIbr8RWKvhMeA/XzKErjtYTB+HSBhpHrWYnJDiupJawCSyH8qYDva9YP8t0f lNQBxMK+yHis0WdC90p8kSno/4kFpAJwQlh8qh81AQ4xXrk3uBBDZupoMVAKBIHAN7AQ OJIT+0r+Zf3NU2niOuM8NSFbP0Yh1+vum1AE+r/nxkDad8weKWP7xMJbaUIdtQfd2m5l u7cQ== 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=YvmYr9/bofH492YlD9AmNRB09EovSBOYsEeqrELZews=; b=s2lWb5rdEWif8DDp+Zl4wHS/WRJ/74MOXqeGKYWITeZ/8nlMqdn8iP7HMlXclH8v06 SjDwE2ATHyEuKpZ+tA3DATyKQLFWGc2CvRjuM3y8SuO1elL29qYoy7xtlj23weP5DXF2 ZFV0X01jlp81mmJ0x7BLIxjgqWgwCAmugFcPQkDp+pdrk74v6cZqADVr7PW6no3Jl8+o yn4/MLvLjJcvR36q6vZh4IMCbslnk7U97arjGD/jp+B3i1Pe1Vzx8NgoqwCOMQraJAXT 2H6RnUN51etaMARIXnQyMrTjxgzJwF3VUimLyRXghoJq8fUJwAEBl2j4nsr5EdW5736T XK7A== X-Gm-Message-State: AOAM531wyxzeuOFOynz0Lhef2iFsCt4MJeMrBFmQ2fIa09c2w8uciq32 ssa7y/pmFRZHvBFemoZznsJCjDjr5u8= X-Google-Smtp-Source: ABdhPJy+Ym9L/INIF7OZM4+IfIuwhhd9wcRkR3XMtBv/LfcsMAn0y38iMo8KxqEh3A6GvdvCHggX7A== X-Received: by 2002:a05:600c:35cc:: with SMTP id r12mr4959741wmq.147.1618829594189; Mon, 19 Apr 2021 03:53:14 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z14sm21482293wrs.96.2021.04.19.03.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:53:13 -0700 (PDT) Message-Id: <0665edb1308b8cd4536d6922fd36315e1abdd9d1.1618829584.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Apr 2021 10:53:03 +0000 Subject: [PATCH 18/18] t1415: set REFFILES for test specific to storage format 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/t1415-worktree-refs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1415-worktree-refs.sh b/t/t1415-worktree-refs.sh index 7ab91241ab7c..a8083a0af3af 100755 --- a/t/t1415-worktree-refs.sh +++ b/t/t1415-worktree-refs.sh @@ -16,7 +16,7 @@ test_expect_success 'setup' ' git -C wt2 update-ref refs/worktree/foo HEAD ' -test_expect_success 'refs/worktree must not be packed' ' +test_expect_success REFFILES 'refs/worktree must not be packed' ' git pack-refs --all && test_path_is_missing .git/refs/tags/wt1 && test_path_is_file .git/refs/worktree/foo &&