From patchwork Thu Oct 21 19:57:55 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: 12576373 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86478C433EF for ; Thu, 21 Oct 2021 19:58:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B6D061251 for ; Thu, 21 Oct 2021 19:58:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231934AbhJUUAV (ORCPT ); Thu, 21 Oct 2021 16:00:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231912AbhJUUAV (ORCPT ); Thu, 21 Oct 2021 16:00:21 -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 8B82BC061764 for ; Thu, 21 Oct 2021 12:58:04 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id j205so50188wmj.3 for ; Thu, 21 Oct 2021 12:58:04 -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=3PTerwBoOMyvE6PWHsCUv1F71NFEMg8doanmTpdDNI8=; b=T5DStPqG9RGWcD0G3QyeMsB6rbfrer36DHvWyagG3KO95B3ibIezPFp24lakPJeBiv eWpQHq3UqcFoyrFZw+YcTDC8aftzJCXmqEmvpSbmOYEontgA3abmbFmzVq5ZzgIAYN+c 5QpjsTph7QmSCyQCs5uYsdcG2sE7ACehcq9PTzIKqQtW95zKum7AxRBkcn98OdkXTxU5 qsVX51CK3GWzoVP/fwVsZG9U/KD09dto9i9cQhskWfIXXnwE9UG/Ya07IWb0MF8gAEjk KyAxmKpZCx2lW3OmLlkZs9EbxEXdR+gnF4Qx/BBDI0/6b6zeMeoCyJhNTCzRfonO8Uvn j3Mw== 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=3PTerwBoOMyvE6PWHsCUv1F71NFEMg8doanmTpdDNI8=; b=CLz3zgwFiz6ZlYOUkIpN3qwV3ON2cNhdGBieSEwYxGxWl7H9QwvYxZnMJfnlwUGNmh PPCqjEAtQlhWCY7vnO/Hz8MXtzxQnZ7M5gYC4vvGvRCa+LT0og+LHbpqtcsArcStv7pn FFYCcUU7XMB0Y+UQcYVezZtgqkkJnKekcF+EHMC9Ue+mpzPqjEwPCFWzQxyLl1zo7IPv 5Oew134g90mDVeHERYjETnZjN0/pvbexzcJp0bXoZgM+Or6o0W/eBuD+2dUvoA/iFdRM ySl2T4PxpFNLdciyZmLsGe5A3XwQvofw1Mo65zt56J4jTvKwLY35iiO6kR5bWHVzi9Gd pksg== X-Gm-Message-State: AOAM532efR8i9x1Zcm7e+MkTF8jlutwAeUk/MZwIg+hiqpd9hR9QTLLK bccBLMC6fxl9qEM1GXlPmHmoPHo4erDX/g== X-Google-Smtp-Source: ABdhPJx23NvHBhohgIiLTjlQw4Tyybs5D+0zBUqIG1w/CH8d1mEv642nxgVI2JdLpWLk5CBzJfgqUg== X-Received: by 2002:a05:600c:358b:: with SMTP id p11mr9048560wmq.88.1634846282853; Thu, 21 Oct 2021 12:58:02 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o40sm388765wms.10.2021.10.21.12.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 12:58:02 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 1/6] Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES) Date: Thu, 21 Oct 2021 21:57:55 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When "GIT-SCRIPT-DEFINES" was added in e4dd89ab984 (Makefile: update scripts when build-time parameters change, 2012-06-20) the rules for generating the scripts themselves were moved further away from the "cmd_munge_script" added in 46bac904581 (Do not install shell libraries executable, 2010-01-31). Let's move these around so that the variables and defines needed by given targets immediately precede them. This is not needed for any subsequent changes to work, but makes the code consistent with how GIT-PERL-DEFINES is structured. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 381bed2c1d2..f52402b24d8 100644 --- a/Makefile +++ b/Makefile @@ -2256,6 +2256,13 @@ SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\ $(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\ $(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV):\ $(perllibdir_SQ) +GIT-SCRIPT-DEFINES: FORCE + @FLAGS='$(SCRIPT_DEFINES)'; \ + if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \ + echo >&2 " * new script parameters"; \ + echo "$$FLAGS" >$@; \ + fi + define cmd_munge_script sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \ @@ -2271,14 +2278,6 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ $@.sh >$@+ endef -GIT-SCRIPT-DEFINES: FORCE - @FLAGS='$(SCRIPT_DEFINES)'; \ - if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \ - echo >&2 " * new script parameters"; \ - echo "$$FLAGS" >$@; \ - fi - - $(SCRIPT_SH_GEN) : % : %.sh GIT-SCRIPT-DEFINES $(QUIET_GEN)$(cmd_munge_script) && \ chmod +x $@+ && \ From patchwork Thu Oct 21 19:57:56 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: 12576375 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D1F5C433FE for ; Thu, 21 Oct 2021 19:58:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 08BA5611C7 for ; Thu, 21 Oct 2021 19:58:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231959AbhJUUAX (ORCPT ); Thu, 21 Oct 2021 16:00:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231937AbhJUUAW (ORCPT ); Thu, 21 Oct 2021 16:00:22 -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 7FC18C061764 for ; Thu, 21 Oct 2021 12:58:05 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id e12so443880wra.4 for ; Thu, 21 Oct 2021 12:58:05 -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=VKapOY7ZJLaC0wZOpYvaKSoYoHqGqfejIRIZJvhodTo=; b=IER+w3bbVsSy3ENArAn/Nc5/P6EcUJJbggmW7KBQdmd5fuD5+1reXSiMH3pcdFe+d4 K8Et8NPaMXOc2GurVU1JRaObWvA8HKzAbqUzZ4El4UbwoQum9W5phjoeTxkG3WR3XWr8 LeD9TvV48B52+1T/V1xFQeLx/SCeYehxlbcZ0kW9GPiAYCnohY2N0Fkkk0+PPfyYw2aN 6h5++jHIka+Wngx8yQ/DiUcOsETSv+Rt42QZGY701ypvh+aXLs741UgNeV7J5aYEQR0F 8qUrzan9AjiBFMshUAtRSto3Fkxtfi5QoLfzR/6mNakFtz305KKF9wJv2sQ0gga36Tgm /k1Q== 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=VKapOY7ZJLaC0wZOpYvaKSoYoHqGqfejIRIZJvhodTo=; b=JiTG1MYFQLnV2sZI7eKpg1INffvpFYyElf0hucapNmN0ayY5NrRJtgzD9SHsChPa8r NgYSULY7fqyWKEVV43CeIiQMj6DEO1F+qpO0UicgZdOhWHZI8PPFU1NyP4Eta9gmzefC paVn9pzsUuBldYmp5Dvt2loqFsFrAeLmoIZdvQdar+6v7VhJXW9FQ4iJEhwbXTcXiJM9 ree0bI4e4Pf/BFySOhC4Uay2XKpSiYf466gTDP5ANlGcFBMSfqmO17bV70bp+p25HAJx b7DbUDgkCdBaqN0eUGclmUYJUdfoeT4qqG5Tkx+Q447Fh8o1SHKHYJhoGkkfhEVSqQPj Cqyg== X-Gm-Message-State: AOAM533CcVzUVDAxS2s0BGXoK1aJDvTNUSj0eSB0LGT7+qd3XfJhb6js 0YMLgMdcXeyZpthq/NyKUplSiozShY/gfQ== X-Google-Smtp-Source: ABdhPJwdcZXv99PgmRBGc+NIPnjHvUbP3h9ooxd48FUIEv2IVk/HIWuDZba0q8Au7avCz8BUSvstoA== X-Received: by 2002:a5d:6d07:: with SMTP id e7mr10065685wrq.425.1634846283841; Thu, 21 Oct 2021 12:58:03 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o40sm388765wms.10.2021.10.21.12.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 12:58:03 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 2/6] Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES) Date: Thu, 21 Oct 2021 21:57:56 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Remove the $(GIT_VERSION) from $(SCRIPT_DEFINES). Now every time HEAD changes in a development copy we don't need to re-build the scripts and script libraries. This has not been needed since 2b9391bc675 (Makefile: do not replace @@GIT_VERSION@@ in shell scripts, 2012-06-20). On my setup this changes the re-making of 44 targets in a development copy where moved HEAD to 27. The $(GIT_VERSION) was seemingly left here by mistake or omission. We didn't need it since 2b9391bc675, but in the later e4dd89ab984 (Makefile: update scripts when build-time parameters change, 2012-06-20) it was added to SCRIPT_DEFINES. The two were part of the same series of patches, and given the summary in [1] and [2] it looks like this was probably a case of some earlier version of a later patch being combined with an updated earlier patch. 1. https://lore.kernel.org/git/20120619232231.GA6328@sigill.intra.peff.net/ 2. https://lore.kernel.org/git/20120619232453.GB6496@sigill.intra.peff.net/ Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f52402b24d8..fdce392929b 100644 --- a/Makefile +++ b/Makefile @@ -2252,7 +2252,7 @@ command-list.h: $(wildcard Documentation/git*.txt) hook-list.h: generate-hooklist.sh Documentation/githooks.txt $(QUIET_GEN)$(SHELL_PATH) ./generate-hooklist.sh >$@ -SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\ +SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\ $(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\ $(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV):\ $(perllibdir_SQ) From patchwork Thu Oct 21 19:57: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: 12576379 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB6EAC433EF for ; Thu, 21 Oct 2021 19:58:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A2687611CE for ; Thu, 21 Oct 2021 19:58:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231948AbhJUUAc (ORCPT ); Thu, 21 Oct 2021 16:00:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231912AbhJUUAW (ORCPT ); Thu, 21 Oct 2021 16:00:22 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F8C3C0613B9 for ; Thu, 21 Oct 2021 12:58:06 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id u18so1242338wrg.5 for ; Thu, 21 Oct 2021 12:58:06 -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=GkgBhVa/QV+2LehHk5YhU2YXM/roo0Wv2l/J6Q9XTbA=; b=eSPgZVmxq27TnlFy9aN5kIiHyYKDstM7b+U0ve/QqIUbtTeJC6YGpVjz4xxH4HJipX Zqkdx4bLXXM51QcEdmxEytcKqMeM2mMGQL+rIgPPPTH8kGfe2tySs0z300Gj/w1aQ/xK +IcmKJfbML6k9/qBlVKJRCmapE2LXxnN5ib3MoVjurAXV7qP3EQ1tIs6knCrNicFRFA5 p1nxGNvq+lwoog0rLQMGUP/W5hzfmFkLQSQRtNvyc6zJv9qf2SaMU4uWYlSLZ/+85RSQ 5F4qvIUUk5lGOLiNH9o31/blAw/y3U2O44xhNRdDJ1/9+7eN+IkFw43X7gqn3htEqeJg Kyuw== 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=GkgBhVa/QV+2LehHk5YhU2YXM/roo0Wv2l/J6Q9XTbA=; b=soESSQPYNAiF7CibLzALbZuAlKAl0HyEt9gqaoBFIbq8ZMVONbf71rLFQ/e8zeT7RS gPb+eExhRskQf3fjmnLDuiYrO0sVz1CszLSpJksDc37PHhRgQVPyUATYoDIQylVTz6Ba Ot09CKIM7WlyNUTrvnazjT9Ry6Pz3o0CWwe2ANn1XJusdNsjMjl9AzyN9dZ8280JbMN9 bkLlY0THrhCWmcRWux9qzU79/pPqbwaN8LG8rpgIWeKTFiAuuFKfqEbKj1CsgiLAyLCC ZQbfAgfUeA8ghfZpOZEqBMZe2O4nbXe3cBRGlhPDAaRviYVFeYy+7GLmqXE89a7JXChX 4cOA== X-Gm-Message-State: AOAM530/to/n65oCTPYofem5NgGoIJc7OcO8EqAjQ/1YKKJfvZR4fNZH p/fcPaz0kIlp2zKsK6QDHIeo/jPQtutK0w== X-Google-Smtp-Source: ABdhPJw3Yr884Whuzh4bpsujV2JebpevNYj2iQUzrgFY1DqxJt6T8E4B3X/BMcEm3JThdA/OAA0/EQ== X-Received: by 2002:adf:a78a:: with SMTP id j10mr9949236wrc.231.1634846284595; Thu, 21 Oct 2021 12:58:04 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o40sm388765wms.10.2021.10.21.12.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 12:58:04 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 3/6] Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES) Date: Thu, 21 Oct 2021 21:57:57 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Stop including $(NO_CURL) in $(SCRIPT_DEFINES). The "@NO_CURL@" replacement added in 6c5c62f3401 (Print an error if cloning a http repo and NO_CURL is set, 2006-02-15) has not been referenced by anything in-tree since 49eb8d39c78 (Remove contrib/examples/*, 2018-03-25). That commit removed the reference from contrib/examples/*, but this @@NO_CURL@@ hasn't been used since git-pull.sh was the primary entry point for "git pull". Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fdce392929b..50eba522f4e 100644 --- a/Makefile +++ b/Makefile @@ -2253,7 +2253,7 @@ hook-list.h: generate-hooklist.sh Documentation/githooks.txt $(QUIET_GEN)$(SHELL_PATH) ./generate-hooklist.sh >$@ SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\ - $(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\ + $(localedir_SQ):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\ $(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV):\ $(perllibdir_SQ) GIT-SCRIPT-DEFINES: FORCE @@ -2268,7 +2268,6 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \ -e 's|@@DIFF@@|$(DIFF_SQ)|' \ -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \ - -e 's/@@NO_CURL@@/$(NO_CURL)/g' \ -e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \ -e $(BROKEN_PATH_FIX) \ -e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \ From patchwork Thu Oct 21 19:57:58 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: 12576381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB9E7C433FE for ; Thu, 21 Oct 2021 19:58:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A422A61221 for ; Thu, 21 Oct 2021 19:58:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231533AbhJUUAe (ORCPT ); Thu, 21 Oct 2021 16:00:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231960AbhJUUAX (ORCPT ); Thu, 21 Oct 2021 16:00:23 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03250C061348 for ; Thu, 21 Oct 2021 12:58:07 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id r7so1213931wrc.10 for ; Thu, 21 Oct 2021 12:58:06 -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=H40BODoaEwWJ/h8RBJsOcP6vlgeNeTbLFeZczmlQgYU=; b=FHVaduouEu8SjmxMPc04NaibauGjx9n7qXgTfzuc8SGU8+8cgkCbupLGwcCfvfFjv+ 47jn8ZvLwHyMPPkXuHHiRGfb+oSY1XZqPXFta8BG/uVK9/wG9u0vBG6VpbnAosmuQCPb qSLafmY//PimTPs/mvtzNTOvHEA5tktOrlvzdvALEQ/nxLB9+3i/4HLXe5w5PZVZJYsM 8NKHg4Tw96n5N+Z6iRRfwaCCxC9d84VLRlIIWNPlairU6hpxU+HHYBrI5mlaKUCsR/L6 6QzAiikY+8idoi//R8SoszdxduKaTrP/Gb2bPlSfX8uTdzGssIuO5hIbk7hI7PghOfuM D8DQ== 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=H40BODoaEwWJ/h8RBJsOcP6vlgeNeTbLFeZczmlQgYU=; b=NI6fSfX+VOiI+XG5UPVWQcu5g3MZHqNqynX3Y8W8f0OPYdTRfihyDULw3y5Tss0Fq6 cDJOVfuLwELGHfbcnB23tIZXDIfhgHu6HXtYbLuWkoIBcVfUCkkPViufrw8oU/rRSFbk tBWy/OcieXPPptIRvAAVaI4xYzhwyir6y3yR2dxc0Mi99A3pMUodWaM6wWoHdlm6VFZl wwrwc82UHbBJEUbKacJdmaPeurag4Dl9XchuiqgTkkUdtl/XgmS06n6REbmQeAW+/Qaa Nalxq35AITSJRcM6RD9E9qRSdSZKq8OmPN/5UFwVkgDDkFS8VCHKGY71hvAQFH+D/jpm VkFw== X-Gm-Message-State: AOAM533K4xWeueOzv1uaR+minA8+bDmC6PAeiWER/6lzxSlvBYLnMn0O cpk9JoAiSuVlgIaPzbXrCwfTsxzHRTJ1Iw== X-Google-Smtp-Source: ABdhPJyLHpxef2+JwBHi+bupEH7esJEbicM/RfApFHuXkRDGs/FbwZrD+Y0Go3stzFehF1qUH13XGg== X-Received: by 2002:a5d:63ca:: with SMTP id c10mr9972949wrw.407.1634846285291; Thu, 21 Oct 2021 12:58:05 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o40sm388765wms.10.2021.10.21.12.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 12:58:04 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 4/6] git-instaweb: unconditionally assume that gitweb is mod_perl capable Date: Thu, 21 Oct 2021 21:57:58 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Remove a check for whether mod_perl is a supported mode of gitweb.cgi added in a51d37c1df6 (Add git-instaweb, instantly browse the working repo with gitweb, 2006-07-01). The reason for the check was to support users who had a newer version of git and an older version of gitweb, it was then subsequently adjusted for changes in the script in f0e588dffc1 (git-instaweb: fix mod_perl detection for apache2, 2009-08-08). It's a fair bet that nobody's running a git from 2021 and gitweb from pre-2007 anymore, so we can unconditionally assume that this will be supported by gitweb.cgi. This allows a subsequent commit to remove the sane_grep() wrapper, this change is split up from that since this is the only case where the "grep" invocation could be removed entirely. Signed-off-by: Ævar Arnfjörð Bjarmason --- git-instaweb.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/git-instaweb.sh b/git-instaweb.sh index 7c55229773e..54094fbe8de 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -380,10 +380,7 @@ TypesConfig "$fqgitdir/mime.types" DirectoryIndex gitweb.cgi EOF - # check to see if Dennis Stosberg's mod_perl compatibility patch - # (<20060621130708.Gcbc6e5c@leonov.stosberg.net>) has been applied - if test -f "$module_path/mod_perl.so" && - sane_grep 'MOD_PERL' "$root/gitweb.cgi" >/dev/null + if test -f "$module_path/mod_perl.so" then # favor mod_perl if available cat >> "$conf" < X-Patchwork-Id: 12576383 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9B8FC433F5 for ; Thu, 21 Oct 2021 19:58:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89156611C7 for ; Thu, 21 Oct 2021 19:58:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231960AbhJUUAe (ORCPT ); Thu, 21 Oct 2021 16:00:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232013AbhJUUAb (ORCPT ); Thu, 21 Oct 2021 16:00:31 -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 B8DE6C061224 for ; Thu, 21 Oct 2021 12:58:07 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id p21so731789wmq.1 for ; Thu, 21 Oct 2021 12:58:07 -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=C3Xl+racZ5cb94llHK5lduwl8tjFQoapIzybIn+nBWM=; b=lJDDLsdn7dqGxzwL5f6kGtR7MhbuBtYh+tSlhUSjaccrHAQTG2IZJ54l86D/mAZDiS nN4ScLe1eHOm41vqcJpT9Fd4pRM/F3qyUZMBsr5SRTF5dGwG/nlp4d9Oa8l850oX/q7k 278+QeP0k6/1NeJgTEFyuihj/oiUH3aJqlUJETMLUUIhM8gK11J9lkK4nSVIo4A1+JOc 5fapkjduKkz0ljghT4LFwp7HzEIokks72gcCBZgwXZGoKP+bzfrEAy02br62B3WDMB4j xYqlhdpDCh4783guG2B0+wpUvSeK7QB8s8spK04HWojq3kDVo4aZcyJ4XoipDQ5+rdrm OH8g== 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=C3Xl+racZ5cb94llHK5lduwl8tjFQoapIzybIn+nBWM=; b=HUoEpFpjFLABGpikLjDhpRyo/6InJH5iMCqwf6Rj5Ynd/BqdYhF1RsEIonebHzwdv9 a0X0+st2cgKZWArBNa8l+3uhyQbMF69oPlrN6pAdFdUOY8vgVpJW65pprCSGgzAn/Oyn cqfjjofkTzAafRDyin0E7wZqWVxHPlSJ7memDdKm+7dS15h9xG4DW+/xyFMsnoZecC5j fhSVyxlPIbdAEw4TpGzQF4+ZI8SHpk2/U9zpNlWDqVvpHHcYHt6dcgTa9v1fKxofG4K/ IqLMwlkW/jjfa32LjCH839RQutSXGR4Mf8jFBn5XyCkbI12TFv1QxiP6pefOJbl9yaqI f3gA== X-Gm-Message-State: AOAM530zluGI9CCtrKA5UCbyb9TSo+QaTfREHw1UpK6Di8fJWcz6cZrP xiQAqb2fbd+MgC3OCc+DSEm6pV8VqJ/iIw== X-Google-Smtp-Source: ABdhPJw2ihjtNZzwTTt1jHERPd9qzyMJ0w6rKqP8EivQ8lKpyvC1Edj5L+179JgSthmS1kk0KPwf7g== X-Received: by 2002:a05:600c:4e94:: with SMTP id f20mr9113422wmq.166.1634846286070; Thu, 21 Oct 2021 12:58:06 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o40sm388765wms.10.2021.10.21.12.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 12:58:05 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 5/6] git-sh-setup: remove unused sane_egrep() function Date: Thu, 21 Oct 2021 21:57:59 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 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, and the sane_egrep() function, dead is_zero_oid() was the only function which still referenced it. Unlike some other functions in git-sh-setup.sh, this function has not been documented in git-sh-setup(1), so per [1] it should be OK to remove it. I'm still unclear about the future of some of the other functions[2], but any questions in that area should not apply here. 1. https://lore.kernel.org/git/xmqqr1dtgnn8.fsf@gitster.g/ 1. https://lore.kernel.org/git/87tuiwjfvi.fsf@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason --- git-sh-setup.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/git-sh-setup.sh b/git-sh-setup.sh index cee053cdc38..758520f5a61 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -177,10 +177,6 @@ sane_grep () { GREP_OPTIONS= LC_ALL=C grep @@SANE_TEXT_GREP@@ "$@" } -sane_egrep () { - GREP_OPTIONS= LC_ALL=C egrep @@SANE_TEXT_GREP@@ "$@" -} - is_bare_repository () { git rev-parse --is-bare-repository } From patchwork Thu Oct 21 19:58:00 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: 12576385 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9725C43217 for ; Thu, 21 Oct 2021 19:58:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A0381611C7 for ; Thu, 21 Oct 2021 19:58:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232025AbhJUUAg (ORCPT ); Thu, 21 Oct 2021 16:00:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232041AbhJUUAc (ORCPT ); Thu, 21 Oct 2021 16:00:32 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93FB7C061226 for ; Thu, 21 Oct 2021 12:58:08 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id d13so1202717wrf.11 for ; Thu, 21 Oct 2021 12:58:08 -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=kyPmiV+ewRktgX2NcwmdwYwjMN/jWryjOSfNWbQ7SSs=; b=K3lqrJITaSZMlHqCR+BlzQ5oC+KzrIknwYJ5MoDgUZx/Hk473O7sO5zb3FHGCjJqtn bB/WaXeaM9anR+D2HCQD1AwdlXfRxZ862EIGn7qvbaZVsgleb8UVss1TUjy7B/z3Xo5V JQsw57VLbveY8+lyTjK4SER+1ibjo4AbAK5z0khAflpOozZcFrH4ZnJtItemDDqKkWEI U9lUACOES0vOn0VDuvPFIyFGHfhP5057eji3aybVJCDqJS6l+SPE/FKGWe+7nl8yb4fC 93m0pB4b+i6X1gq9ex5pyKjkQDILgA0msXFlr0JRtCmC3Lg7uYwYrZQ6Ce+Lo3hbPX3V DuXg== 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=kyPmiV+ewRktgX2NcwmdwYwjMN/jWryjOSfNWbQ7SSs=; b=3HiagV9pi1QRL/l1jMSdL7MPipSBUg4a0R+ZE8FasX20kKIM9Nl8MA4cdtVm40cwO4 D0KooMZkk9XlyuQhx+iabw2KP2qOcq59ku4KqbWzwsIpaKwM5N4kzFICQykoMm2gPEYO g6t/SnmjcZfu/7Ze9ChlqtR1qmrc8iqjQ+nuneRGxBG2HghUVNxLMMoW+4VdLQwBzsLl scH/gCjqsoOIC4NUZfdYy5e4uzBMOke2IIBHdiu/XDgNYwkCfp3kHOdh00L/nDQf+roA KzNUGWODFZwiIdNNymq0p9D9ADTiJXSDytL97WheHAiOoHmQkWciASuxaD7yj1TsqsbA HjXg== X-Gm-Message-State: AOAM533I72j3uQeY34pRXg9RMbiPaG+v7pjb0zfbR91qgnj3+gl5EzM0 2TnM+sTnyxsoftJaTnN9Ati/0/a4JQWJvg== X-Google-Smtp-Source: ABdhPJxWAeos1m3HbElnwOKViXeFjAQIoE4Jx3DfHpqRiHwOWo70TqiZ7rXhr6h3r1C+mCdWrmqsig== X-Received: by 2002:adf:bd8a:: with SMTP id l10mr9908197wrh.159.1634846286921; Thu, 21 Oct 2021 12:58:06 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o40sm388765wms.10.2021.10.21.12.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Oct 2021 12:58:06 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 6/6] git-sh-setup: remove "sane_grep", it's not needed anymore Date: Thu, 21 Oct 2021 21:58:00 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.1494.g88b39a443e1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Remove the sane_grep() shell function in git-sh-setup. The two reasons for why it existed don't apply anymore: 1. It was added due to GNU grep supporting GREP_OPTIONS. See e1622bfcbad (Protect scripted Porcelains from GREP_OPTIONS insanity, 2009-11-23). Newer versions of GNU grep ignore that, but even on older versions its existence won't matter, none of these sane_grep() uses care about grep's output, they're merely using it to check if a string exists in a file or stream. We also don't care about the "LC_ALL=C" that "sane_grep" was using, these greps for fixed or ASCII strings will behave the same under any locale. 2. The SANE_TEXT_GREP added in 71b401032b9 (sane_grep: pass "-a" if grep accepts it, 2016-03-08) isn't needed either, none of these grep uses deal with binary data. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 6 +----- config.mak.uname | 1 - configure.ac | 8 -------- contrib/buildsystems/CMakeLists.txt | 1 - git-filter-branch.sh | 2 +- git-instaweb.sh | 4 ++-- git-sh-setup.sh | 4 ---- 7 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 50eba522f4e..01585bfebdc 100644 --- a/Makefile +++ b/Makefile @@ -305,9 +305,6 @@ all:: # # Define NO_TCLTK if you do not want Tcl/Tk GUI. # -# Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep -# and egrep that are pickier when their input contains non-ASCII data. -# # The TCL_PATH variable governs the location of the Tcl interpreter # used to optimize git-gui for your system. Only used if NO_TCLTK # is not set. Defaults to the bare 'tclsh'. @@ -2254,7 +2251,7 @@ hook-list.h: generate-hooklist.sh Documentation/githooks.txt SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\ $(localedir_SQ):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\ - $(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV):\ + $(gitwebdir_SQ):$(PERL_PATH_SQ):$(PAGER_ENV):\ $(perllibdir_SQ) GIT-SCRIPT-DEFINES: FORCE @FLAGS='$(SCRIPT_DEFINES)'; \ @@ -2272,7 +2269,6 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e $(BROKEN_PATH_FIX) \ -e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \ -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \ - -e 's|@@SANE_TEXT_GREP@@|$(SANE_TEXT_GREP)|g' \ -e 's|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \ $@.sh >$@+ endef diff --git a/config.mak.uname b/config.mak.uname index 3236a4918a3..d0701f9beb0 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -58,7 +58,6 @@ ifeq ($(uname_S),Linux) # -lrt is needed for clock_gettime on glibc <= 2.16 NEEDS_LIBRT = YesPlease HAVE_GETDELIM = YesPlease - SANE_TEXT_GREP=-a FREAD_READS_DIRECTORIES = UnfortunatelyYes BASIC_CFLAGS += -DHAVE_SYSINFO PROCFS_EXECUTABLE_PATH = /proc/self/exe diff --git a/configure.ac b/configure.ac index 031e8d3fee8..5ee25ec95c8 100644 --- a/configure.ac +++ b/configure.ac @@ -507,14 +507,6 @@ if test -n "$ASCIIDOC"; then esac fi -if grep -a ascii configure.ac >/dev/null; then - AC_MSG_RESULT([Using 'grep -a' for sane_grep]) - SANE_TEXT_GREP=-a -else - SANE_TEXT_GREP= -fi -GIT_CONF_SUBST([SANE_TEXT_GREP]) - ## Checks for libraries. AC_MSG_NOTICE([CHECKS for libraries]) # diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index fd1399c440f..86b46114464 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -781,7 +781,6 @@ foreach(script ${git_shell_scripts}) string(REPLACE "@@USE_GETTEXT_SCHEME@@" "" content "${content}") string(REPLACE "# @@BROKEN_PATH_FIX@@" "" content "${content}") string(REPLACE "@@PERL@@" "${PERL_PATH}" content "${content}") - string(REPLACE "@@SANE_TEXT_GREP@@" "-a" content "${content}") string(REPLACE "@@PAGER_ENV@@" "LESS=FRX LV=-c" content "${content}") file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content}) endforeach() diff --git a/git-filter-branch.sh b/git-filter-branch.sh index cb893728136..3a51d4507c7 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -579,7 +579,7 @@ if [ "$filter_tag_name" ]; then git hash-object -t tag -w --stdin) || die "Could not create new tag object for $ref" if git cat-file tag "$ref" | \ - sane_grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1 + grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1 then warn "gpg signature stripped from tag object $sha1t" fi diff --git a/git-instaweb.sh b/git-instaweb.sh index 54094fbe8de..4349566c891 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -49,7 +49,7 @@ resolve_full_httpd () { *apache2*|*lighttpd*|*httpd*) # yes, *httpd* covers *lighttpd* above, but it is there for clarity # ensure that the apache2/lighttpd command ends with "-f" - if ! echo "$httpd" | sane_grep -- '-f *$' >/dev/null 2>&1 + if ! echo "$httpd" | grep -- '-f *$' >/dev/null 2>&1 then httpd="$httpd -f" fi @@ -399,7 +399,7 @@ EOF # plain-old CGI resolve_full_httpd list_mods=$(echo "$full_httpd" | sed 's/-f$/-l/') - $list_mods | sane_grep 'mod_cgi\.c' >/dev/null 2>&1 || \ + $list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \ if test -f "$module_path/mod_cgi.so" then echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf" diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 758520f5a61..1eb79458b48 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -173,10 +173,6 @@ git_pager() { eval "$GIT_PAGER" '"$@"' } -sane_grep () { - GREP_OPTIONS= LC_ALL=C grep @@SANE_TEXT_GREP@@ "$@" -} - is_bare_repository () { git rev-parse --is-bare-repository }