From: Robert Pluim <rpluim@gmail.com>
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: emacs-devel@gnu.org
Subject: Re: master b8a96f0556 4/4: Port pre-commit hook to Git 2.35.0
Date: Mon, 28 Feb 2022 16:47:20 +0100 [thread overview]
Message-ID: <87bkyrj8mv.fsf@gmail.com> (raw)
In-Reply-To: <0951dfda-d7f9-eea6-b472-ad2bf35a5997@cs.ucla.edu> (Paul Eggert's message of "Thu, 24 Feb 2022 10:23:48 -0800")
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
>>>>> On Thu, 24 Feb 2022 10:23:48 -0800, Paul Eggert <eggert@cs.ucla.edu> said:
Paul> On 2/24/22 00:48, Robert Pluim wrote:
>> Is it worth putting this in emacs-28?
Paul> Yes, if people plan to commit to emacs-28 with Git 2.35.0 or later and
Paul> don't want to see annoying/puzzling diagnostics about "sane_egrep"
Paul> being missing. (Git 2.35.0 was released last month.)
Well, Iʼm about to do that by cherry-picking this to emacs-28, so
thatʼs at least one instance :-)
Eli, is the following OK for emacs-28?
Robert
--
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Backport-Port-pre-commit-hook-to-Git-2.35.0.patch --]
[-- Type: text/x-diff, Size: 1166 bytes --]
From c773ebe260c72207f004026560ffe65148a2c26d Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 23 Feb 2022 11:29:56 -0800
Subject: [PATCH] Backport: Port pre-commit hook to Git 2.35.0
To: emacs-devel@gnu.org
* build-aux/git-hooks/pre-commit: Use LC_ALL=C grep -E instead of
sane_egrep (removed in Git 2.35.0).
(cherry picked from commit b8a96f055624f86fe965a0d1b7b2495b2db80e63)
---
build-aux/git-hooks/pre-commit | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/build-aux/git-hooks/pre-commit b/build-aux/git-hooks/pre-commit
index a55004680f..49bf05f2d9 100755
--- a/build-aux/git-hooks/pre-commit
+++ b/build-aux/git-hooks/pre-commit
@@ -45,7 +45,9 @@ git_diff=
# 'git diff' will backslash escape tabs and newlines, so we don't have
# to worry about word splitting here.
-$git_diff $head | sane_egrep 'ChangeLog|^-|/-|[^-+./_0-9A-Z_a-z]' | while IFS= read -r new_name; do
+$git_diff $head |
+LC_ALL=C grep -E 'ChangeLog|^-|/-|[^-+./_0-9A-Z_a-z]' |
+while IFS= read -r new_name; do
case $new_name in
-* | */-*)
echo "$new_name: File name component begins with '-'."
--
2.35.1.291.gdab1b7905d
next prev parent reply other threads:[~2022-02-28 15:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <164564529649.2580.1114329124469279209@vcs2.savannah.gnu.org>
[not found] ` <20220223194141.A2AFEC00894@vcs2.savannah.gnu.org>
2022-02-24 8:48 ` master b8a96f0556 4/4: Port pre-commit hook to Git 2.35.0 Robert Pluim
2022-02-24 18:23 ` Paul Eggert
2022-02-28 15:47 ` Robert Pluim [this message]
2022-02-28 16:49 ` Eli Zaretskii
2022-02-28 16:54 ` Paul Eggert
2022-03-01 9:02 ` Robert Pluim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bkyrj8mv.fsf@gmail.com \
--to=rpluim@gmail.com \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.