[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-22-g7589e43

[by Werner Koch]

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  7589e43b21c8d80c5a57ecb6eb78dfcd0b5dac46 (commit)
      from  ae981dd8f454e2a8bbc6429bed5abc5e87cc83d5 (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 -----------------------------------------------------------------
commit 7589e43b21c8d80c5a57ecb6eb78dfcd0b5dac46
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 20 11:08:06 2012 +0100

    Do not copy default merge commit log entries into the ChangeLog.
    
    * scripts/gitlog-to-changelog: Skip merge commits.

diff --git a/scripts/gitlog-to-changelog b/scripts/gitlog-to-changelog
index d9f594f..66fb49f 100755
--- a/scripts/gitlog-to-changelog
+++ b/scripts/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2011-11-02 07:53'; # UTC
+my $VERSION = '2012-01-20 10:14'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -204,6 +204,7 @@ sub parse_amend_file($)
 
   my $prev_date_line = '';
   my @prev_coauthors = ();
+
   while (1)
     {
       defined (my $in = <PIPE>)
@@ -217,6 +218,10 @@ sub parse_amend_file($)
       $n_read == $log_nbytes
         or die "$ME:$.: unexpected EOF\n";
 
+      # Skip log entries with the default merge commit message.
+      $log =~ /^.*\n\nMerge branch '.*\n\s*/
+        and goto SKIPCOMMIT;
+
       # Extract leading hash.
       my ($sha, $rest) = split ':', $log, 2;
       defined $sha
@@ -328,6 +333,7 @@ sub parse_amend_file($)
           print "\n", join ("\n", @line), "\n";
         }
 
+    SKIPCOMMIT:
       defined ($in = <PIPE>)
         or last;
       $in ne "\n"

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

Summary of changes:
 scripts/gitlog-to-changelog |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org