[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.18-11-g66e9380

[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, STABLE-BRANCH-2-0 has been updated
       via  66e93807a9fc7e72d7a6458711104d32342e4283 (commit)
       via  4e7ec0bb838623ffb88faee99ba029a8b66b80c0 (commit)
      from  333b870929b9f6f65d9b229d301c0b38719da430 (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 66e93807a9fc7e72d7a6458711104d32342e4283
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 40a8035..056b9b7 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
@@ -201,6 +201,7 @@ sub parse_amend_file($)
 
   my $prev_date_line = '';
   my @prev_coauthors = ();
+
   while (1)
     {
       defined (my $in = <PIPE>)
@@ -214,6 +215,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
@@ -313,6 +318,7 @@ sub parse_amend_file($)
           print "\n", join ("\n", @line), "\n";
         }
 
+    SKIPCOMMIT:
       defined ($in = <PIPE>)
         or last;
       $in ne "\n"

commit 4e7ec0bb838623ffb88faee99ba029a8b66b80c0
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 20 11:20:55 2012 +0100

    Add files to .gitignore

diff --git a/.gitignore b/.gitignore
index f1afc9c..65141e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,3 +141,5 @@ tools/mk-tdata
 tools/symcryptrun
 tools/watchgnupg
 tools/gpgtar
+/doc/gnupg1.info
+/po/gnupg.pot

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

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


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