Re: master b8a96f0556 4/4: Port pre-commit hook to Git 2.35.0

Re: master b8a96f0556 4/4: Port pre-commit hook to Git 2.35.0

[Robert Pluim]

>>>>> On Wed, 23 Feb 2022 14:41:40 -0500 (EST), Paul Eggert <eggert@cs.ucla.edu> said:

    Paul> branch: master
    Paul> commit b8a96f055624f86fe965a0d1b7b2495b2db80e63
    Paul> Author: Paul Eggert <eggert@cs.ucla.edu>
    Paul> Commit: Paul Eggert <eggert@cs.ucla.edu>

    Paul>     Port pre-commit hook to Git 2.35.0
    
    Paul>     * build-aux/git-hooks/pre-commit: Use LC_ALL=C grep -E instead of
    Paul>     sane_egrep (removed in Git 2.35.0).

Is it worth putting this in emacs-28?

Robert
-- 

Re: master b8a96f0556 4/4: Port pre-commit hook to Git 2.35.0

[Paul Eggert]

On 2/24/22 00:48, Robert Pluim wrote:
> Is it worth putting this in emacs-28?

Yes, if people plan to commit to emacs-28 with Git 2.35.0 or later and 
don't want to see annoying/puzzling diagnostics about "sane_egrep" being 
missing. (Git 2.35.0 was released last month.)

Re: master b8a96f0556 4/4: Port pre-commit hook to Git 2.35.0

[Robert Pluim]

[-- 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

Re: master b8a96f0556 4/4: Port pre-commit hook to Git 2.35.0

[Eli Zaretskii]

> From: Robert Pluim <rpluim@gmail.com>
> Date: Mon, 28 Feb 2022 16:47:20 +0100
> Cc: emacs-devel@gnu.org
> 
>     >> 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?

Yes, I guess.

Re: master b8a96f0556 4/4: Port pre-commit hook to Git 2.35.0

[Paul Eggert]

On 2/28/22 08:49, Eli Zaretskii wrote:
>> From: Robert Pluim <rpluim@gmail.com>
>> Date: Mon, 28 Feb 2022 16:47:20 +0100
>> Cc: emacs-devel@gnu.org
>>
>>      >> 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?
> 
> Yes, I guess.

It looks good to me too; thanks.

Re: master b8a96f0556 4/4: Port pre-commit hook to Git 2.35.0

[Robert Pluim]

>>>>> On Mon, 28 Feb 2022 08:54:47 -0800, Paul Eggert <eggert@cs.ucla.edu> said:

    Paul> It looks good to me too; thanks.

Done as b8bc359bbf

Robert
--