From patchwork Sat Sep 11 11:17:48 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: 12486325 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 AE702C4332F for ; Sat, 11 Sep 2021 11:21:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F0F261213 for ; Sat, 11 Sep 2021 11:21:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235695AbhIKLTM (ORCPT ); Sat, 11 Sep 2021 07:19:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232239AbhIKLTI (ORCPT ); Sat, 11 Sep 2021 07:19:08 -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 F24A4C061756 for ; Sat, 11 Sep 2021 04:17:55 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id l18-20020a05600c4f1200b002f8cf606262so3274799wmq.1 for ; Sat, 11 Sep 2021 04:17:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NlDfm+S4r9jEmtIx4YrIPa0oY63pkQXSh2iijVbY4Os=; b=D1c2KQnb8bewK9cgRW0a8rH8tu1QAbyiwm1fMojKHeAWdRIlvJ1Lr8I+EcKagPPftU RvBQiAPTMRHyjB7cWhLl0qPQd0b3iGFt2DpUKls3vvt2OLHuxbbMzCY8iRl3jVAHEKrZ 63fgMcRi3vpBFgx4r4oe4R0Dh8z8AqpVFfW8StJKQiF3nYuYKqQ9IZfAJ/GVIIcwSJCY lqpiJRtet+Lvu0PyVsTHejRAntzyZPFHx9h1KOcHeIDUx2UFmQIkZdnKTn9AifOCFQj7 KDsoXGQ5nJ5q1UWc3UySeK4eBl8Ja8J/mD3ZlprMhvVzp3lQaHEwIHehiDD9qQKoixBH 5/Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NlDfm+S4r9jEmtIx4YrIPa0oY63pkQXSh2iijVbY4Os=; b=xPKHyno9qmWcQssfg2LWQczcx7w4fcDfhhjRQ5RpXakZ7cDctrR6FkJebw1HInJxEG UhfS0PscGU16fKnWh30molw+ToZeiRiRwlYRRsB57iCPKbVaNULnjAzuOlJfa00Hb8sg po0hxwYG28jqwYghMvZy9RqQtMb+yNV9fSe+amj8DB8Ecghpx6KG0O55bE9wPCoFcTcu hoHWlW3qeelFqNDJVd2Sh1QCwjAFuc6YDt4qhZalMRawt08KDPGP2N+KuDLpFB1hwYrt Iq4GEsHBU4SPdXiSVKsFQK81LrQIcgX33Fp8/CTnUCHO4hywFosTOpl7jF/D29nuwSSr k2SA== X-Gm-Message-State: AOAM530ApY0bYEYqCjCgJdd5cuN9rssXnQ6U4d20ZnCzjVmkhrBtwuwO XTc/5e6GKZt7A994LpurVx3Buk7v2O2Oug== X-Google-Smtp-Source: ABdhPJw2DBcwRV/MXK25xI6LcxN1i15joRiUM0flYDhCc42cjhq6T2GK4qVpgRh2Gj0YB0lwW+b8IQ== X-Received: by 2002:a05:600c:4ba2:: with SMTP id e34mr2407693wmp.50.1631359074310; Sat, 11 Sep 2021 04:17:54 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p5sm1549731wrd.25.2021.09.11.04.17.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 04:17:53 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Johannes Schindelin , Eric Wong , Prathamesh Chavan , Peter Baumann , Philippe Blain , Andrei Rybak , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= Subject: [PATCH v3 1/4] git-submodule: remove unused is_zero_oid() function Date: Sat, 11 Sep 2021 13:17:48 +0200 Message-Id: X-Mailer: git-send-email 2.33.0.984.gea2c3555113 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The is_zero_oid() function in git-submodule.sh has not been used since e83e3333b57 (submodule: port submodule subcommand 'summary' from shell to C, 2020-08-13), so we can remove it. This was the last user of the sane_egrep() function in git-sh-setup.sh. I'm not removing it in case some out-of-tree user relied on it. Per the discussion that can be found upthread of [1]. 1. https://lore.kernel.org/git/87tuiwjfvi.fsf@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason --- git-submodule.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index dbd2ec20503..aeb96c58243 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -63,11 +63,6 @@ isnumber() n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1" } -# Given a full hex object ID, is this the zero OID? -is_zero_oid () { - echo "$1" | sane_egrep '^0+$' >/dev/null 2>&1 -} - # Sanitize the local git environment for use within a submodule. We # can't simply use clear_local_git_env since we want to preserve some # of the settings from GIT_CONFIG_PARAMETERS. From patchwork Sat Sep 11 11:17:49 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: 12486321 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,URIBL_BLOCKED,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 8E64EC433F5 for ; Sat, 11 Sep 2021 11:21:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6771A61205 for ; Sat, 11 Sep 2021 11:21:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235618AbhIKLTL (ORCPT ); Sat, 11 Sep 2021 07:19:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233893AbhIKLTK (ORCPT ); Sat, 11 Sep 2021 07:19:10 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D40E8C061574 for ; Sat, 11 Sep 2021 04:17:56 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id v20-20020a1cf714000000b002e71f4d2026so2389595wmh.1 for ; Sat, 11 Sep 2021 04:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t5HCiHpeQZ49V5miwIkorHOuQElq0vl4DcKXh4bDMMI=; b=CVsiaAlSkTEXIgL7es4OWtwJC0qcYjPmAEI1hVUeB+mu1g1cIwhkkHdiqT0vtdz1K1 YJvnQdj7qnLUPFlo6LL6wHve38mGweb2EbmuexmN7xPkNyFCrB4oh4IolRKH+aDHe98p atx8eJd3tDD7lAW3tlOesPVoHho/Wi4F6AkLC4Eh8TvB/tx8QU1a0Fd7Im6hZtiOC52j Px6zlwy8ZR9yFsru70QnfmnTihPkN2fIKdv/JdrIBm1bGSj31rpvLatxS3rEi3khTkv7 TTo0fZZLkENdc86M+2OmB5og0UnVnEjUZ154GP/6Js1uOL05okKoqmDh6bjOnJn0QB02 AMbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t5HCiHpeQZ49V5miwIkorHOuQElq0vl4DcKXh4bDMMI=; b=NG0bQtHyZjEye9stWIzHHjdLqi69xD9c6WQWTM+JpD8JbSHAmCJ4i0vXrLuOLtLu8Y XiiMNTk7/NKnx4CFBXyb8uBweTRbuzW7lR9et11IzPqKDSrzt3BKCoKRSxHWTxuMxDnO OrXvDEaDuEiXDP+WopdVqPFxyGtzqhaeM4xAnsep8Ba9QqSgWPV3OHV25lypSlzBD4Q8 Bag+Ao5VM3SEgZm/51l8warESIJuxAMTwFAsCWPOXZclV7RUOACq8jgczDq51+0z4YEy dwSsZfdeR36dKf69Oo3stS9pxCmGd/16RED3o/m/wOFn4pB+bEs4WgzVHEGjVhW8vfGp L1NQ== X-Gm-Message-State: AOAM5330H7SMTEcKIWhxPlmTKfIUV9YbmIleKCxphK89g4dtAURW7gjt QPbhFJvZrmqozm4BRo7nNNvWTS3cB+au8Q== X-Google-Smtp-Source: ABdhPJxS2d8Z+A6bH9WRdZDxP6KfqCOjMCzJ+4Pu5nn37K4lDtHq6HB/bcBm06m+SEguV5PYZZBu4w== X-Received: by 2002:a1c:1fc2:: with SMTP id f185mr2367506wmf.22.1631359075254; Sat, 11 Sep 2021 04:17:55 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p5sm1549731wrd.25.2021.09.11.04.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 04:17:54 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Johannes Schindelin , Eric Wong , Prathamesh Chavan , Peter Baumann , Philippe Blain , Andrei Rybak , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= Subject: [PATCH v3 2/4] git-sh-setup: remove unused "pull with rebase" message Date: Sat, 11 Sep 2021 13:17:49 +0200 Message-Id: X-Mailer: git-send-email 2.33.0.984.gea2c3555113 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Remove the "pull with rebase" message previously used by the git-pull.sh script, which was removed in 49eb8d39c78 (Remove contrib/examples/*, 2018-03-25). Even if some out-of-tree user copy/pasted the old git-pull.sh code, and relied on passing it a "pull with rebase" argument, we'll fall back on the "*" case here, they just won't get the "pull with rebase" part of their message translated. I don't think it's likely that anyone out-of-tree relied on that, but I'm being conservative here per the discussion that can be found upthread of [1]. 1. https://lore.kernel.org/git/87tuiwjfvi.fsf@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason --- git-sh-setup.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 10d97641856..cee053cdc38 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -223,9 +223,6 @@ require_clean_work_tree () { "rewrite branches") gettextln "Cannot rewrite branches: You have unstaged changes." >&2 ;; - "pull with rebase") - gettextln "Cannot pull with rebase: You have unstaged changes." >&2 - ;; *) eval_gettextln "Cannot \$action: You have unstaged changes." >&2 ;; @@ -242,9 +239,6 @@ require_clean_work_tree () { rebase) gettextln "Cannot rebase: Your index contains uncommitted changes." >&2 ;; - "pull with rebase") - gettextln "Cannot pull with rebase: Your index contains uncommitted changes." >&2 - ;; *) eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2 ;; From patchwork Sat Sep 11 11:17:50 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: 12486327 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,URIBL_BLOCKED,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 AC24CC433FE for ; Sat, 11 Sep 2021 11:21:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D71B611F2 for ; Sat, 11 Sep 2021 11:21:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235565AbhIKLTS (ORCPT ); Sat, 11 Sep 2021 07:19:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233243AbhIKLTK (ORCPT ); Sat, 11 Sep 2021 07:19:10 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8C21C061757 for ; Sat, 11 Sep 2021 04:17:57 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id t18so6579497wrb.0 for ; Sat, 11 Sep 2021 04:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=We0/183vDZznJ5HPp/BdHvZ1dyRP219QB41Q6uX+w4s=; b=RKn1ZGcU83QBciW/R4FFMs+a/zJdS5crVa06CPaB/qelzCj09PUs2XPd4MT5ZBUNVs i+vnv4kbFS3xCROKIO60+ZQdHIOEW+6goRUzBHo9GZtGDG5upmaj6t7dmCmic5QUndCZ dK1dfzSQ/OfvWURMHNhQSd+mKzI1Kro8wXQYV1eKPniwfScKYKLMgiCwVq/a3fJHKBkh ol5APXiwVTBdgwsvHXa+oLjgUPh16PeuqRA4kuQoJ/G52aTHUm/dKLXKUD15661TlfBt PsA0g45gTG8GAFUbG1XZN1qqUfpU4+o83b80d2n2vMjqJNFNXvHV8OfcbdLfpECkUrRj QkAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=We0/183vDZznJ5HPp/BdHvZ1dyRP219QB41Q6uX+w4s=; b=FgtcaVEiTnAHYx2yIosYcpVqclUQLFwPPDmf6nYdcqyttPotUF62/T/Jfp6yCz/K6j Ma8ZDstFfOrpF+dpbQSpxNgsOWcnaBJuW9LDK6z8IGtiI0VzZscojql6SQwOmTeLvEIJ WFJJXbYwOXQVt9Pv7b6WbavNUuozx7jsLnaLtGFgdEVIaZobXJvR7VlIKyCYmnMuhDfz zRBwpijp8UkaaxyTXA0WqqajHBdYlaF7A1gNUThw1IAMkwT61IuQRy6pFpE/6/jIVaqa 8/ufNjXCSuTBO6ZxbyYHVWhQ6r6SzN9e6ZVwetOqzxQnG0ClCXECItF+5WLvs9YJDF23 YnZg== X-Gm-Message-State: AOAM531Uvb1RfMXDg+QZN64+AjvRo0Mp18TvjcWfU41fwTbLApTKvGCM B0yIq8vW2/ErST+zeH7Leh9WI4vLaFqbKA== X-Google-Smtp-Source: ABdhPJwboSvnZejJj4YrHoYysdZo7o7hbQzw4wZonKXTM9E2b51ATjqMESbZSwelBK+unD5VIEefSg== X-Received: by 2002:adf:e34a:: with SMTP id n10mr2649762wrj.320.1631359076048; Sat, 11 Sep 2021 04:17:56 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p5sm1549731wrd.25.2021.09.11.04.17.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 04:17:55 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Johannes Schindelin , Eric Wong , Prathamesh Chavan , Peter Baumann , Philippe Blain , Andrei Rybak , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= Subject: [PATCH v3 3/4] git-bisect: remove unused SHA-1 $x40 shell variable Date: Sat, 11 Sep 2021 13:17:50 +0200 Message-Id: X-Mailer: git-send-email 2.33.0.984.gea2c3555113 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This variable was last used in code removed in 06f5608c14 (bisect--helper: `bisect_start` shell function partially in C, 2019-01-02). Signed-off-by: Ævar Arnfjörð Bjarmason --- git-bisect.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/git-bisect.sh b/git-bisect.sh index 6a7afaea8da..b59f3aaad43 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -34,8 +34,6 @@ Please use "git help bisect" to get the full man page.' OPTIONS_SPEC= . git-sh-setup -_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' -_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" TERM_BAD=bad TERM_GOOD=good From patchwork Sat Sep 11 11:17:51 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: 12486329 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 C2772C4321E for ; Sat, 11 Sep 2021 11:21:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9870361205 for ; Sat, 11 Sep 2021 11:21:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235708AbhIKLTU (ORCPT ); Sat, 11 Sep 2021 07:19:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230249AbhIKLTL (ORCPT ); Sat, 11 Sep 2021 07:19:11 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78C03C061756 for ; Sat, 11 Sep 2021 04:17:58 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id u19-20020a7bc053000000b002f8d045b2caso3109489wmc.1 for ; Sat, 11 Sep 2021 04:17:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=meH3fOctP5lD+lsanoQbp3wU+fwial9KgNCgjfdnCUE=; b=eqNoTQL+VTPAUBsgHXhsyI7yBr0zw44jHRNdhzserCGt1CqgR59aAPxnslXGRghh8c qpuZM8o999ah26NDT3YhXk650aw3uvtCpwohdzHov/q9r+K6J4oe6KkDiYY54uOao/WO DriCiTj5VyDfbiUnRj8++f1ceM32TV0yT6ZknCAbIV6Z2mfSvynt8O1EDvha9EYDN6Vt A/xQ71qIgK19qc+oMDjN/xFT2cm3nFF453/IDqraFcMWJm1BbnDgdH/SCjp0Y0oD/UuK yjAAI3b9dBQrZcGUsXfsu9HSxm93YSjxORS6h2Eyq8tjU/JtsIdPd+/M5YshvhuT4H+D z+sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=meH3fOctP5lD+lsanoQbp3wU+fwial9KgNCgjfdnCUE=; b=FY+3mIsJpRtPYCIOF3TPNGwl/9FppUXzvSt0m9B3oxiWQ8ZxjRpXNMIaiOc+EHp6YV DozD00imNdObl2nXAzlfa0NKCRRJpiKehzlFfRKhZ6JtHQW5+XSM6bwzCzMMW56UBfkp bBGKOAjBA8452LX9CKHYWRxb13dRe8TqfR7JF8JEoQq5QDOPk27By9imrIZs8mAXOL6p BJz9OwoXCiQ3gfO0wtDNF+6cCENKZUSVa6mpw4tj9Sq4fYRjyyxrYfeFk12oqqv7SXp/ vIQkT59ry94lTd0pdbwojpPZwyieNLaYPoiaoZX/vu+Zvk9rz4JlHT3K3u9/iYk/+DeJ 0c+A== X-Gm-Message-State: AOAM53012+HTqjt4RgCZD6VQjdAh4LVV8O3vHPeeXFipLTrrerQPKmMs cIbtsBqGhhZ87Ko9Sk7yv2zdZCa2I6F2Yg== X-Google-Smtp-Source: ABdhPJz5eFNRTkMFwph8Js7q+wgoE7KqPEN3YS52uC/EnOER8JAPLL1FN3uOWxNvUjmmG3BsgW2yDw== X-Received: by 2002:a1c:43c5:: with SMTP id q188mr2229221wma.175.1631359076884; Sat, 11 Sep 2021 04:17:56 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p5sm1549731wrd.25.2021.09.11.04.17.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 04:17:56 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Johannes Schindelin , Eric Wong , Prathamesh Chavan , Peter Baumann , Philippe Blain , Andrei Rybak , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= Subject: [PATCH v3 4/4] test-lib: remove unused $_x40 and $_z40 variables Date: Sat, 11 Sep 2021 13:17:51 +0200 Message-Id: X-Mailer: git-send-email 2.33.0.984.gea2c3555113 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org These two have fallen out of use with the SHA-256 migration. The last use of $_x40 was removed in fc7e73d7ef (t4013: improve diff-post-processor logic, 2020-08-21) and The last use of $_z40 was removed in 7a868c51c2 (t5562: use $ZERO_OID, 2019-12-21), but it was then needlessly refactored to be hash-agnostic in 192b517589 (t: use hash-specific lookup tables to define test constants, 2020-02-22). We can just remove it. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/test-lib.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index fc1e5215198..a0b944e8feb 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -534,7 +534,7 @@ SQ=\' # when case-folding filenames u200c=$(printf '\342\200\214') -export _x05 _x35 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB ZERO_OID OID_REGEX +export _x05 _x35 LF u200c EMPTY_TREE EMPTY_BLOB ZERO_OID OID_REGEX # Each test should start with something like this, after copyright notices: # @@ -1423,10 +1423,9 @@ then fi # Convenience -# A regexp to match 5, 35 and 40 hexdigits +# A regexp to match 5 and 35 hexdigits _x05='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x35="$_x05$_x05$_x05$_x05$_x05$_x05$_x05" -_x40="$_x35$_x05" test_oid_init @@ -1435,7 +1434,6 @@ OID_REGEX=$(echo $ZERO_OID | sed -e 's/0/[0-9a-f]/g') OIDPATH_REGEX=$(test_oid_to_path $ZERO_OID | sed -e 's/0/[0-9a-f]/g') EMPTY_TREE=$(test_oid empty_tree) EMPTY_BLOB=$(test_oid empty_blob) -_z40=$ZERO_OID # Provide an implementation of the 'yes' utility; the upper bound # limit is there to help Windows that cannot stop this loop from