diff --git a/scripts/gitlog2changes b/scripts/gitlog2changes index 7f59a5d..15435c5 100755 --- a/scripts/gitlog2changes +++ b/scripts/gitlog2changes @@ -63,11 +63,22 @@ sub parse_gitlog { my $cur = { message => [] }; my @states = qw(commit tree parent author committer blank message); my $st = 0; + my $gpgsig = 0; while (my $line = <$fh>) { next if $line =~ /^#/; chomp($line); my $expect = $states[$st]; if ($expect eq "blank") { + if ($gpgsig > 0) { + if ($line =~ /-----END PGP SIGNATURE-----/) { + $gpgsig = 0; + } + next; + } + if ($line =~ /^gpgsig/) { + $gpgsig = 1; + next; + } if ($line ne "") { die "Malformed git rev-parse output ($cur->{commit}): expected blank line, got \"$line\"\n"; }