grep branch, master, updated. v2.9-2-g63fe282

[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  63fe2825aae11b595dbfe8d68b605867cc1d9198 (commit)
      from  7caed4e9385fcf12e47e4998d9e0a005d70de37c (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=63fe2825aae11b595dbfe8d68b605867cc1d9198


commit 63fe2825aae11b595dbfe8d68b605867cc1d9198
Author: Jim Meyering <address@hidden>
Date:   Wed Jun 22 08:39:44 2011 +0200

    maint: update bootstrap from gnulib
    
    * bootstrap: Update to latest, so it no longer inserts empty lines
    in .gitignore files.
    * .gitignore: Let bootstrap move "!..." lines to end of file.

diff --git a/.gitignore b/.gitignore
index 04320a6..818afc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
-!/gnulib-tests/Makefile.am
-!/lib/Makefile.am
-!/lib/savedir.c
-!/lib/savedir.h
-!/m4/djgpp.m4
 *.a
 *.exe
 *.o
@@ -58,3 +53,8 @@ ChangeLog
 Makefile
 Makefile.in
 TAGS
+!/gnulib-tests/Makefile.am
+!/lib/Makefile.am
+!/lib/savedir.c
+!/lib/savedir.h
+!/m4/djgpp.m4
diff --git a/bootstrap b/bootstrap
index 522ac70..b286beb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-05-16.16; # UTC
+scriptversion=2011-06-22.06; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -290,7 +290,7 @@ sort_patterns() {
     P
     x
     s/^\n//
-  }'
+  }' | sed '/^$/d'
 }
 
 # If $STR is not already on a line by itself in $FILE, insert it,

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

Summary of changes:
 .gitignore |   10 +++++-----
 bootstrap  |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
grep