From patchwork Thu Jun 17 10:41:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12327415 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=-15.8 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,USER_AGENT_GIT 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 058CFC2B9F4 for ; Thu, 17 Jun 2021 10:42:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D071460FDA for ; Thu, 17 Jun 2021 10:42:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231882AbhFQKoR (ORCPT ); Thu, 17 Jun 2021 06:44:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231791AbhFQKoP (ORCPT ); Thu, 17 Jun 2021 06:44:15 -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 90D89C061574 for ; Thu, 17 Jun 2021 03:42:06 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso4654270wmc.1 for ; Thu, 17 Jun 2021 03:42:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BJWZYvbtEs3IWF7Ur+1fzpKJdq1aVEfGTE2+4EodpcA=; b=Twqk6LL0owcXWm8HFCRhSiPdr9SpvIpFxiGMC3UqKUl0Z/ys8/z5XkWtq9ndUnkYDn eMOTI1AyB9OOMUWDSLcZo6h5PZEd9llaOsBxLmVNiPBZMTfusYLSp40fLx8szwLoj/OO ao4YC0iX4i8eSIDrUEOQGTRetCQS5qoUf6YgLxaJG0ZNm0dgqXMF6AQrEdFVE2Vglg+t 0Keunat1PNytP/FGWm2yWa7sV554bb6cwt6cC+mqdswAt7Lma5hGcTzRXZK8+HH2Ajfl IHn+wa33CmZ5VOqyWRPLopFlCAKRVig4eDFEWOQGzqcLYzjahyPg4BB1qostjuJj4Uo2 aofg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BJWZYvbtEs3IWF7Ur+1fzpKJdq1aVEfGTE2+4EodpcA=; b=H3/2fsbMsEeBuIToXHeBi/+krAFr1CkXamlK2jEXEwU1L5KJ6lBa61PSnJyvXyIdTR B+0dYc9iyLkmSLdZmw5phwChw86tiaPkPz4fVBNcWNgSBCUbUxyQFq6kcs+wJDvhnf9g Lftfny+Kp+Fc4A3ksqgFTsuz4nLF+3t49gSNNfmwjv4ZeHCjkOTfXGWmR+EXxICO7vK9 f31XU4RRZUZ4UO0ptfUb5orCHw0zJ3EoH9BvoOymS8ZvBixN6ACJ2pVUnxYD4mjCUvp1 9MlJmlZmRSLZO8/9ipPBtQ0Rjn0yykIZ7ltIozYZDzT/q5na2RPW0y7XUhtAUcDknLKV yoYw== X-Gm-Message-State: AOAM531CjZyDuuNLeqDHxyOBUmAo9NvIKCeDCJhWOYQxdCEZjLbmKjDc 7Ebe9vxuyAJ1g01v/J8iyUzG6ewMLw3FFw== X-Google-Smtp-Source: ABdhPJwIXwWJrjfJgHpXILUJdTAvG395BGbAqZ5t34EVGlNUxpgX3Pu3Mra6qvgTKKNiZ606oDEQiQ== X-Received: by 2002:a05:600c:1d1a:: with SMTP id l26mr4351855wms.189.1623926524932; Thu, 17 Jun 2021 03:42:04 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p10sm4784607wrr.33.2021.06.17.03.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 03:42:04 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Olga Telezhnaya , Jeff King , Andrei Rybak , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= Subject: [PATCH v2 1/6] mktag tests: parse out options in helper Date: Thu, 17 Jun 2021 12:41:57 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.571.gdba276db2c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change check_verify_failure() helper to parse out options from $@. This makes it easier to add new options in the future. See 06ce79152be (mktag: add a --[no-]strict option, 2021-01-06) for the initial implementation. Let's also replace "" quotes with '' for the test body, the varables we need are eval'd into the body, so there's no need for the quoting confusion. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3800-mktag.sh | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index 6275c98523..e9008744e3 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -12,15 +12,29 @@ test_description='git mktag: tag object verify test' # given in the expect.pat file. check_verify_failure () { - test_expect_success "$1" " - test_must_fail git mktag message && - grep '$2' message && - if test '$3' != '--no-strict' + subject=$1 && + message=$2 && + shift 2 && + + no_strict= && + while test $# != 0 + do + case "$1" in + --no-strict) + no_strict=yes + ;; + esac && + shift + done && + + test_expect_success "fail with [--[no-]strict]: $subject" ' + test_must_fail git mktag err && + if test -z "$no_strict" then - test_must_fail git mktag --no-strict message.no-strict && - grep '$2' message.no-strict + test_must_fail git mktag err2 && + test_cmp err err2 fi - " + ' } test_expect_mktag_success() { @@ -243,7 +257,8 @@ tagger . <> 0 +0000 EOF check_verify_failure 'verify tag-name check' \ - '^error:.* badTagName:' '--no-strict' + '^error:.* badTagName:' \ + --no-strict ############################################################ # 11. tagger line label check #1 @@ -257,7 +272,8 @@ This is filler EOF check_verify_failure '"tagger" line label check #1' \ - '^error:.* missingTaggerEntry:' '--no-strict' + '^error:.* missingTaggerEntry:' \ + --no-strict ############################################################ # 12. tagger line label check #2 @@ -272,7 +288,8 @@ This is filler EOF check_verify_failure '"tagger" line label check #2' \ - '^error:.* missingTaggerEntry:' '--no-strict' + '^error:.* missingTaggerEntry:' \ + --no-strict ############################################################ # 13. allow missing tag author name like fsck @@ -301,7 +318,8 @@ tagger T A Gger < EOF check_verify_failure 'disallow malformed tagger' \ - '^error:.* badEmail:' '--no-strict' + '^error:.* badEmail:' \ + --no-strict ############################################################ # 15. allow empty tag email @@ -425,7 +443,8 @@ this line should not be here EOF check_verify_failure 'detect invalid header entry' \ - '^error:.* extraHeaderEntry:' '--no-strict' + '^error:.* extraHeaderEntry:' \ + --no-strict test_expect_success 'invalid header entry config & fsck' ' test_must_fail git mktag X-Patchwork-Id: 12327417 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=-15.8 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,USER_AGENT_GIT 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 AD58DC48BE5 for ; Thu, 17 Jun 2021 10:42:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F7B2613BA for ; Thu, 17 Jun 2021 10:42:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231974AbhFQKoS (ORCPT ); Thu, 17 Jun 2021 06:44:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231878AbhFQKoP (ORCPT ); Thu, 17 Jun 2021 06:44:15 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C315C06175F for ; Thu, 17 Jun 2021 03:42:07 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id y13-20020a1c4b0d0000b02901c20173e165so3429822wma.0 for ; Thu, 17 Jun 2021 03:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8UqdX3ZT1FDhf+ek2ieelEFM7LoEC3gfsY2xujK9Ii8=; b=hwx6hkkV6dxq39SsTyOaiDceESvs3fnGcniWAfCYr3jZtlrfEhRfqOqYfS7LnJ/fnc 67CvxCyEexiF08ZzNZJZr5OdHPo4XNTwTzCd8akNdI6rr9fHoyeUxiFhffb6weCdqRRX pB/0+dBJKPHiro1+xoWFGnbb9TkIe0+tH49Sib6tDozVHThmVQoOg6lCWlS1suQuQFA+ vU/zF+F7bbZ/mtr0tGFIWtw9PrL/IXH1kjm8AwEd8Cog36nKGY9hnQYNH3yxO2B5YtPK K3xpRJM/IV/+GrLz5pDly1ywgkYffbCmCpLw/aHmrofYf7/XTtSfRKW2koVgDQRYDc1m ei7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8UqdX3ZT1FDhf+ek2ieelEFM7LoEC3gfsY2xujK9Ii8=; b=ZGBxLrXLSNTRdt6rOgKmzaufmEORpMW4P1fvy1CeLodyhHJp6l7xklvLTLLXdzJcOo +0WUoM2zNonWiw1Gj3cZlCzRHuEjUUqIx03U5gHbcQ7KAQchMM2hVkvwMCyiZUpv1aZM gcwP3KFJa+JNoMtM7fDzUEGMiSVmrm4yGdCUhjb4XSg8iOoZvbXlNek8vk+2z6hg0aTJ FOpLjaDxggNJ7/8wgxYnynaf+MzOGZ8aP/GFh+J5m3s2VKSOtE++1NE2Ht2Z4KMwuHxw oH/eolXl4v4bdjQat72W3thWSqV2MHR+Itha00Xzs03UOldHeU3IVWRi4RbmGPNwbLge 9tyA== X-Gm-Message-State: AOAM5326a1uF0UgceuvjmtRTfI5CogIBDnC3UFrDHYBPCuGpfz8xpdSZ Cw+0sH+AmKRt4nDgpXrfvmG6yi9cKqmG0g== X-Google-Smtp-Source: ABdhPJy31nJvNoHoOWJG2ceVyPauDd9e0fk2kN5Dekj7xbw9DhT2oDlQYs39Xh4QB2r09rFWdyBG1g== X-Received: by 2002:a7b:c3c6:: with SMTP id t6mr4168959wmj.66.1623926525823; Thu, 17 Jun 2021 03:42:05 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p10sm4784607wrr.33.2021.06.17.03.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 03:42:05 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Olga Telezhnaya , Jeff King , Andrei Rybak , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= Subject: [PATCH v2 2/6] mktag tests: invert --no-strict test Date: Thu, 17 Jun 2021 12:41:58 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.571.gdba276db2c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the mktag --no-strict test to actually test success under --no-strict, that test was added in 06ce79152be (mktag: add a --[no-]strict option, 2021-01-06). It doesn't make sense to check that we have the same failure except when we want --no-strict, by doing that we're assuming that the behavior will be different under --no-strict, bun nothing was testing for that. We should instead assert that --strict is the same as --no-strict, except in the cases where we've declared that it's not. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3800-mktag.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index e9008744e3..951e6d39c2 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -33,6 +33,8 @@ check_verify_failure () { then test_must_fail git mktag err2 && test_cmp err err2 + else + git mktag --no-strict X-Patchwork-Id: 12327419 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=-15.8 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,USER_AGENT_GIT 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 D07DFC49EA2 for ; Thu, 17 Jun 2021 10:42:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABE56613BF for ; Thu, 17 Jun 2021 10:42:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231933AbhFQKoT (ORCPT ); Thu, 17 Jun 2021 06:44:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231903AbhFQKoQ (ORCPT ); Thu, 17 Jun 2021 06:44:16 -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 27575C061760 for ; Thu, 17 Jun 2021 03:42:08 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id c18-20020a05600c0ad2b02901cee262e45fso3390123wmr.4 for ; Thu, 17 Jun 2021 03:42:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HXG0IimmgizI65s2PSt1MGlX3WA3s5FxZIYp9vwwb3c=; b=RNPg4oPtoQ3bfS8VJXDrNrF9gtyeLkC18P93WeTInpPmq7EPyUlSZVoV/SO3uXbGsV U372GM4/m7VD8ggnxiyI7OcRPPTcrONx4T9AGmqwwhjszBkNZv2kVMhuWBJhiU2K+ttb rDQq01vTMh2brTTyFe1rD0PtugHvcMQ+L511lEtbkufnJaNJu439m5CG8LXQn6kzjEEQ iUfQHQ9fNaffoAjgCtYIM2A5qU8jaO31c2wrtJB7mb0WiwonhmOAijhlNuJ/jMem7pHG /MXIK9EfOhhfO002TCfSKXfMFUx0rSFSmJPhu5HtdDLK4JWzvetdDldKA3D8KBJeC8lh OADQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HXG0IimmgizI65s2PSt1MGlX3WA3s5FxZIYp9vwwb3c=; b=Nw1cOv67jdlUkqRqiW7jz4al8eH8U2yEYIZ33S3ygd1ZJ8fMmAg32z17rePrYfxcys TmuMJMq4lZtAp9AobUt03AHNcnnvNRXDF0t/aG05hal/gEZXIm7mimG1PSNYPOhQ12lV jSlLSzY/6/cjZVBbKETBT1z6zZOsygRZ0Tj5rYDyaxWqNfvwt4R14n9if/7ex25kenQu nBlJP30hV/0Rl7XNMXVv5ywkUevQsL0Fd7qY71UvIVBn+yG3lk0U9xIcuLqUYQg2dqER iMqvi0BjNVk8d0CWBHYFkz++ocDV17iKeEB8RL1hCfrnHu108HpGAN3wBHUdx+QAYT17 X7XQ== X-Gm-Message-State: AOAM530B6pKBScyEVYSWHbs8L2gu/8536wQlVnbBT269mpHg9oTiyJb4 +AZOKm1PkEITE/sBDp36nNWc7Y0HjVp5qQ== X-Google-Smtp-Source: ABdhPJw4QOIY8W0MXVVG8KsbRnrvDcgub/NmGFP3xu+XJjLCUwLC9RwTl1zajKmj7PrtYpWZ3+PclA== X-Received: by 2002:a05:600c:214c:: with SMTP id v12mr4239509wml.33.1623926526551; Thu, 17 Jun 2021 03:42:06 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p10sm4784607wrr.33.2021.06.17.03.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 03:42:06 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Olga Telezhnaya , Jeff King , Andrei Rybak , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= Subject: [PATCH v2 3/6] mktag tests: test hash-object --literally and unreachable fsck Date: Thu, 17 Jun 2021 12:41:59 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.571.gdba276db2c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Extend the mktag tests to pass the tag we've created through both hash-object --literally and fsck. This checks that fsck itself will not complain about certain invalid content if a reachable tip isn't involved. Due to how fsck works and walks the graph the failure will be different if the object is reachable, so we might succeed before we've created the ref. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3800-mktag.sh | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index 951e6d39c2..78c6f64e36 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -16,6 +16,8 @@ check_verify_failure () { message=$2 && shift 2 && + no_strict= && + fsck_obj_ok= && no_strict= && while test $# != 0 do @@ -23,6 +25,9 @@ check_verify_failure () { --no-strict) no_strict=yes ;; + --fsck-obj-ok) + fsck_obj_ok=yes + ;; esac && shift done && @@ -37,6 +42,23 @@ check_verify_failure () { git mktag --no-strict 0 +0000 EOF check_verify_failure 'verify object (hash/type) check -- correct type, nonexisting object' \ - '^fatal: could not read tagged object' + '^fatal: could not read tagged object' \ + --fsck-obj-ok cat >tag.sig < 0 +0000 EOF check_verify_failure 'verify object (hash/type) check -- mismatched type, valid object' \ - '^fatal: object.*tagged as.*tree.*but is.*commit' + '^fatal: object.*tagged as.*tree.*but is.*commit' \ + --fsck-obj-ok ############################################################ # 9.5. verify object (hash/type) check -- replacement @@ -245,7 +269,8 @@ tagger . <> 0 +0000 EOF check_verify_failure 'verify object (hash/type) check -- mismatched type, valid object' \ - '^fatal: object.*tagged as.*tree.*but is.*blob' + '^fatal: object.*tagged as.*tree.*but is.*blob' \ + --fsck-obj-ok ############################################################ # 10. verify tag-name check @@ -260,7 +285,8 @@ EOF check_verify_failure 'verify tag-name check' \ '^error:.* badTagName:' \ - --no-strict + --no-strict \ + --fsck-obj-ok ############################################################ # 11. tagger line label check #1 @@ -275,7 +301,8 @@ EOF check_verify_failure '"tagger" line label check #1' \ '^error:.* missingTaggerEntry:' \ - --no-strict + --no-strict \ + --fsck-obj-ok ############################################################ # 12. tagger line label check #2 @@ -291,7 +318,8 @@ EOF check_verify_failure '"tagger" line label check #2' \ '^error:.* missingTaggerEntry:' \ - --no-strict + --no-strict \ + --fsck-obj-ok ############################################################ # 13. allow missing tag author name like fsck @@ -321,7 +349,8 @@ EOF check_verify_failure 'disallow malformed tagger' \ '^error:.* badEmail:' \ - --no-strict + --no-strict \ + --fsck-obj-ok ############################################################ # 15. allow empty tag email @@ -446,7 +475,8 @@ EOF check_verify_failure 'detect invalid header entry' \ '^error:.* extraHeaderEntry:' \ - --no-strict + --no-strict \ + --fsck-obj-ok test_expect_success 'invalid header entry config & fsck' ' test_must_fail git mktag X-Patchwork-Id: 12327423 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=-15.8 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,USER_AGENT_GIT 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 56A25C49361 for ; Thu, 17 Jun 2021 10:42:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 30FCD613BF for ; Thu, 17 Jun 2021 10:42:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232064AbhFQKoV (ORCPT ); Thu, 17 Jun 2021 06:44:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231959AbhFQKoR (ORCPT ); Thu, 17 Jun 2021 06:44:17 -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 EA271C061767 for ; Thu, 17 Jun 2021 03:42:08 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso6032121wmh.4 for ; Thu, 17 Jun 2021 03:42:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=36bwokKYWmY161A+2G1dJi4xe/jqNPMXHxdMDmkvcvM=; b=HBqQKEIQNxeAN6TlqZmutZDU1R1PAnnIyo6FOsAv6iewMsW/fYqDa3Am3ujJFRfIRu nOj3PYGG00urOAiYvUncKGBNdZoNUw+tggv4CpZNYwxEiuJTukT4HFIB1LEwKafSPUZ4 Yru/8Ix4FL3GBHxQmbhjBdTpJYxuuwZSYVJIHBJu71/gQy5PYucbntyCmG8tCJAzSkpX QsDUnVUJp6g7PbuPaCPCzjndCH6vtmg2xnkmVLBMyhEMSGltRKbDfzqL2tXJU3pblNPo BeGm7ve6KaMtMtS1jpZs3mcqYNcemyOBkCj5KAaYyvo7ui+dPQ4s82oDEmRB8zLK2B+g y54A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=36bwokKYWmY161A+2G1dJi4xe/jqNPMXHxdMDmkvcvM=; b=gdRLdesEnyy1h5wddQX8cjO4ITOf34AGqTG2s2X09zp+VlQqiHUN5Od1w96OlRvq1l wcO2J70Xihr5kAqiPK/EXxe4j2h3RMwasHl3GlddRDiYwREmbaAPvjx3EbYa5YMTPFXV HLRd2+ntGAn9yvJ/AyW7UzKMH25n1uEHrgKKqDtKr4/uKplPfgxmRgeA8uNIHEONCt4T rWgZNbLIoJuG+VoSyFAr+lS6Xbtt+qrsHmgD0EiGs8Q7fCmoWhG/9D2kEzDS+wR41/hb B7QjQBXO4HsZYVzyGlV4T83lYYBb9kjm5JYAIi1+pO5Xsh3FxtXZTCY6T08lC76qf4UK A0/A== X-Gm-Message-State: AOAM533S7cmTMaskA2QzLIKThQBAcxlpCi0Zkg+/8QvH9YhWAutwQAv+ pZQzbEX4jmF7KONZ7FlPeJR/bY7/NqDnvQ== X-Google-Smtp-Source: ABdhPJzTOfQG3B+Erc1INzEjIjx0MEAc4nHIc62X4DWVzKa/3MOSVGFtGqxSLxXix6yH2SaWEuq4LA== X-Received: by 2002:a1c:e456:: with SMTP id b83mr4301096wmh.178.1623926527322; Thu, 17 Jun 2021 03:42:07 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p10sm4784607wrr.33.2021.06.17.03.42.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 03:42:06 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Olga Telezhnaya , Jeff King , Andrei Rybak , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= Subject: [PATCH v2 4/6] mktag tests: test update-ref and reachable fsck Date: Thu, 17 Jun 2021 12:42:00 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.571.gdba276db2c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Extend the mktag tests to pass the created bad tag through update-ref and fsck. The reason for passing it through update-ref is to guard against it having a segfault as for-each-ref did before c6854508808 (ref-filter: fix NULL check for parse object failure, 2021-04-01). Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3800-mktag.sh | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index 78c6f64e36..67f6ecbe88 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -44,11 +44,13 @@ check_verify_failure () { ' test_expect_success "setup: $subject" ' + tag_ref=refs/tags/bad_tag && + # Reset any leftover state from the last $subject rm -rf bad-tag && git init --bare bad-tag && - git -C bad-tag hash-object -t tag -w --stdin --literally "bad-tag/$tag_ref" && + + # Unlike fsck-ing unreachable content above, this + # will always fail. + test_must_fail git -C bad-tag fsck + ' } test_expect_mktag_success() { From patchwork Thu Jun 17 10:42:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12327421 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=-15.8 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,USER_AGENT_GIT 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 8C1CFC48BE5 for ; Thu, 17 Jun 2021 10:42:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7339660FDA for ; Thu, 17 Jun 2021 10:42:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232011AbhFQKoU (ORCPT ); Thu, 17 Jun 2021 06:44:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231926AbhFQKoR (ORCPT ); Thu, 17 Jun 2021 06:44:17 -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 B90C0C061574 for ; Thu, 17 Jun 2021 03:42:09 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id j18so2938347wms.3 for ; Thu, 17 Jun 2021 03:42:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wBGjz2fkuFoI+S640MMDPBx+MIG9joqhsHVO9Ilqn7c=; b=pdUGF7CmKYqnKdKrLpo46CyQN6qP7Bmgoc3hS+cUVLP6qXNuEt15QyMT0fRNWbUfCe Pk07UAkAAovYpFbH964aOH92ffnqj8uVbbn6pzI3/FLU3ZNB1Gs5k+KGQH7E6coQ+kKU OyLy8ayLPfHHzhkt10fNovBEufhICGj62H+rL7s0CekSaeY7Lvs9CEjvhVVNp9FmBBeH 4iG+mqNLBiUgmzfdHHHE9SMN2sGdSWULKd6RrgGZo0yMztzs8oe2WIdi41mUNMOkDzPG 48JXKTbVd9mZNUaKknr4i/lcfHnk6tVbCfltGeyo96zQQy3AbKyZvxzsNj8Ob33/4Hh7 JOsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wBGjz2fkuFoI+S640MMDPBx+MIG9joqhsHVO9Ilqn7c=; b=Jp5nqSc8fiHDnP61BGzihpkWE/lDv68Ljh3FM4vYqjDGA7XtFCp+iX8K9byoYt0/oD 6YRngknNADyDjs1/lOvEoR9T/FIk/I7QaJqlCTv0zBtd6CbXLflX33UUdYVPeXUPfHby Gy+IRIRp/MV2PHOzim9Z7xbenAYMwcBGtZUmU53YyENHa/NXRhSbjImtA5u+tQXxdBDu EUX9IDvrf+3G+y4wNB/svkHCmiyTExtPrcvh82YNekarkjjkzEatZJIUv+PICvNVHd66 4oRtN5xx9J9UIkHfdLmWi7eJ3XNjvydc8F/9ggPCwXY0OjhNTgHlksqSyteNWRDkdsjc +RHg== X-Gm-Message-State: AOAM531HlcJ/xxcEuqUNqTD1dG9qN+/l3THd73Ci0tj8iu258jsCbv3U J54sDo3ZAkPi5X0tFc+D/QwjVQZA515FMA== X-Google-Smtp-Source: ABdhPJyKZCViR89wPwUeU0QvrPtNYl2OmAh8KGqA3eo7lotHOQ+HlYX5KpDWbh3jSogrzmzfR5hCpQ== X-Received: by 2002:a1c:7210:: with SMTP id n16mr4172204wmc.75.1623926528178; Thu, 17 Jun 2021 03:42:08 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p10sm4784607wrr.33.2021.06.17.03.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 03:42:07 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Olga Telezhnaya , Jeff King , Andrei Rybak , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= Subject: [PATCH v2 5/6] mktag tests: test for-each-ref Date: Thu, 17 Jun 2021 12:42:01 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.571.gdba276db2c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add a "for-each-ref" for all the mktag tests. This test would have caught the segfault which was fixed in c6854508808 (ref-filter: fix NULL check for parse object failure, 2021-04-01). Let's make sure we test that code more exhaustively. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3800-mktag.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index 67f6ecbe88..bb71303399 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -78,6 +78,19 @@ check_verify_failure () { # will always fail. test_must_fail git -C bad-tag fsck ' + + test_expect_success "for-each-ref: $subject" ' + # Make sure the earlier test created it for us + git rev-parse "$bad_tag" && + + echo "$bad_tag" >"bad-tag/$tag_ref" && + + printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected && + git -C bad-tag for-each-ref "$tag_ref" >actual && + test_cmp expected actual && + + test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)" + ' } test_expect_mktag_success() { From patchwork Thu Jun 17 10:42:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12327425 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=-15.8 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,USER_AGENT_GIT 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 C72A2C2B9F4 for ; Thu, 17 Jun 2021 10:42:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF39B60FDA for ; Thu, 17 Jun 2021 10:42:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231903AbhFQKoY (ORCPT ); Thu, 17 Jun 2021 06:44:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231984AbhFQKoT (ORCPT ); Thu, 17 Jun 2021 06:44:19 -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 9C51AC061574 for ; Thu, 17 Jun 2021 03:42:10 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id y13-20020a1c4b0d0000b02901c20173e165so3429921wma.0 for ; Thu, 17 Jun 2021 03:42:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A11HEYz9uf6kil7FsMfFll+6e0aKtiYD9p0x+lCJ9tI=; b=McLW62SVBEa++ff6+vp1oM4WD+JsLwKXkWBpUdYzvtM09iv6BIAmVI+/yxe89I8/GR Q2IWCivbZQWrmk2oMf6NOmIECijKmSAhU56QCfWTUHhwMSMt9MprRrxihLXCnNTLHVkQ Ihww7e5IMfG9GW9136YzmU1L5u3Gk5OPTWG0cPR0e1FQB8ILhazKf+IfwjZv5ffNtr2E Q4F94j3dlnZF1N6YLmMF75m9RKadr7Xv6GMy4hrc8Nhwlem3lmpteR7fFE1x7Gsxkh0I 39C+chd0l2/r/nS+EHym0MWgtg/nTgzlBlkiQrmKwWTG+eJfxpwJDGaSLpxWUCcReBEi 7J2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A11HEYz9uf6kil7FsMfFll+6e0aKtiYD9p0x+lCJ9tI=; b=MLmk3VwAFwZATMbea7Q+Fhrz94xGVcgywnuplZQ/d4RaJjZ/NgQzm8nTaVkZY1N/yW QkgJIwJasKlCDKUH4YHup5ZyMoNaAjVw8Z2go3C0Dp3f6EcU+UH0+4tnh1mYLyKt2bDO M0oTUM52nEzXB5+Fl5KpOs/E4VxvMgPAPP3pqjbkn0b2izbQKBzBTTqF4k0ikamHwcIz fgj/AVkFT+RT8wJyk1Qwh3pr5A3ALuPETwu6maWhTiBIASQMO7ykebKA4MgtmVF3Ufh4 nnljxRSmsG58Xz9JPaZECjZoe5yNZ+el7CIm9lIM/BJZmvK2Y/urQ1Kvd+X3M489S+qV I7Gg== X-Gm-Message-State: AOAM5332UGnzv47BKYyP/bO3whiQWRo/cuioeHFzMVXTLZStVssR99FO 6ayOO9lrrWBVxSaHVSsm8W0G/cGMGQN/yA== X-Google-Smtp-Source: ABdhPJw3ZGs1lZoWl+De+kVG84hQ9fl1hnw8nrzjZ6+aFTE2Bdu0q1crVs0i8igvOjDz0VN3r3+Pzg== X-Received: by 2002:a1c:a901:: with SMTP id s1mr4299154wme.184.1623926529059; Thu, 17 Jun 2021 03:42:09 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p10sm4784607wrr.33.2021.06.17.03.42.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 03:42:08 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Olga Telezhnaya , Jeff King , Andrei Rybak , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= Subject: [PATCH v2 6/6] mktag tests: test fast-export Date: Thu, 17 Jun 2021 12:42:02 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.571.gdba276db2c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Pass the bad tags we've created in the mktag tests through fast-export, it will die on the bad object or ref, let's make sure that happens. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t3800-mktag.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index bb71303399..0544d58a6e 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -91,6 +91,14 @@ check_verify_failure () { test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)" ' + + test_expect_success "fast-export & fast-import: $subject" ' + # Make sure the earlier test created it for us + git rev-parse "$bad_tag" && + + test_must_fail git -C bad-tag fast-export --all && + test_must_fail git -C bad-tag fast-export "$bad_tag" + ' } test_expect_mktag_success() {