grep branch, master, updated. v2.18-118-ga159d14

[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  a159d14c79c86c441e834a513e7b27ea735c26ff (commit)
      from  61c8431a8cb6b6de247e833e1daf69df1d454c96 (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=a159d14c79c86c441e834a513e7b27ea735c26ff


commit a159d14c79c86c441e834a513e7b27ea735c26ff
Author: Jim Meyering <address@hidden>
Date:   Mon Apr 28 17:51:25 2014 -0700

    maint: make ChangeLog generation more robust
    
    * Makefile.am (gen-ChangeLog): Sync changes from GNU coreutils,
    to ensure exit status is propagated, and to support an optional
    git-log-fix file.

diff --git a/Makefile.am b/Makefile.am
index 2be7292..e618a00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,9 +45,12 @@ gen_start_date = 2009-11-27
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
        $(AM_V_GEN)if test -d .git; then                                \
+         log_fix="$(srcdir)/build-aux/git-log-fix";                    \
+         test -e "$$log_fix"                                           \
+           && amend_git_log="--amend=$$log_fix"                        \
+           || amend_git_log=;                                          \
          $(top_srcdir)/build-aux/gitlog-to-changelog                   \
-           --amend=$(srcdir)/build-aux/git-log-fix                     \
-           --since=$(gen_start_date) > $(distdir)/cl-t;                \
-         rm -f $(distdir)/ChangeLog;                                   \
-         mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
+           $$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
+           { rm -f $(distdir)/ChangeLog &&                             \
+             mv $(distdir)/cl-t $(distdir)/ChangeLog; }                \
        fi

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

Summary of changes:
 Makefile.am |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
grep