security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

Do not copy default merge commit log entries into the ChangeLog. 

* scripts/gitlog-to-changelog: Skip merge commits.
This commit is contained in:
Werner Koch 2012-01-20 11:08:06 +01:00
parent ae981dd8f4
commit 7589e43b21
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/gitlog-to-changelog
View File

@ -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"