grep branch, master, updated. v2.24-4-g614c368

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  614c368a74b64bf526c8df5391353feee6a9b7b2 (commit)
      from  cce2fd5520bba35cf9b264de2f1b6131304f19d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=614c368a74b64bf526c8df5391353feee6a9b7b2


commit 614c368a74b64bf526c8df5391353feee6a9b7b2
Author: Jim Meyering <address@hidden>
Date:   Tue Mar 15 08:17:23 2016 -0700

    maint: avoid spurious "binary file ... matches" in generated THANKS
    
    * Makefile.am (THANKS): Don't apply grep to a stream containing
    NUL bytes.  Sync this rule from the one in coreutils: it was missing
    some improvements.
    Reported by Bailes Magio in http://bugs.gnu.org/22899

diff --git a/Makefile.am b/Makefile.am
index d04cd79..188d475 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,12 +73,12 @@ THANKS: THANKS.in Makefile.am .mailmap thanks-gen
        $(AM_V_GEN)rm -f address@hidden $@;                                     
\
        {                                                               \
          $(prologue); echo;                                            \
-         { perl -ne '/^$$/.../^$$/ and print' $(srcdir)/THANKS.in      \
-             | grep -v '^$$' | perl -pe 's/  +/\0/';                   \
+         { perl -ne '/^$$/.../^$$/ and !/^$$/ and s/  +/\0/ and print' \
+             $(srcdir)/THANKS.in;                                      \
            git log --pretty=format:'%aN%x00%aE'                        \
              | $(ASSORT) -u;                                           \
          } | $(srcdir)/thanks-gen                                      \
-           | LC_ALL=en_US.UTF-8 sort -f;                               \
+           | LC_ALL=en_US.UTF-8 sort -k1,1;                            \
          echo;                                                         \
          printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:;     \
        } > address@hidden && chmod a-w address@hidden && mv address@hidden $@

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
grep