diff options
| author | Werner Koch <[email protected]> | 2012-01-20 10:08:06 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-01-20 10:22:41 +0000 |
| commit | 66e93807a9fc7e72d7a6458711104d32342e4283 (patch) | |
| tree | 38904bccb6b31edb42edba5f4b6f740b8e99e101 | |
| parent | Add files to .gitignore (diff) | |
| download | gnupg-66e93807a9fc7e72d7a6458711104d32342e4283.tar.gz gnupg-66e93807a9fc7e72d7a6458711104d32342e4283.zip | |
Do not copy default merge commit log entries into the ChangeLog.
* scripts/gitlog-to-changelog: Skip merge commits.
| -rwxr-xr-x | scripts/gitlog-to-changelog | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/gitlog-to-changelog b/scripts/gitlog-to-changelog index 40a803554..056b9b7fb 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" |