diff options
| author | Christian Beier <dontmind@freeshell.org> | 2011-03-29 17:29:53 +0200 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2011-03-29 17:29:53 +0200 |
| commit | 8a2183b2d911fe014e94275a723124c9e5a34c0f (patch) | |
| tree | 709a6e96cd3bdfac5cc01817c79c6a2bfa53e1ff | |
| parent | eeafad20bfbc4ff3728f02016d354ec28df01068 (diff) | |
| download | libvncserver-8a2183b2d911fe014e94275a723124c9e5a34c0f.zip libvncserver-8a2183b2d911fe014e94275a723124c9e5a34c0f.tar.gz | |
Fix skipping of merge commits in log convert script.
| -rwxr-xr-x | utils/git2cl.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/git2cl.pl b/utils/git2cl.pl index 1c2ab3f..6a8a1e7 100755 --- a/utils/git2cl.pl +++ b/utils/git2cl.pl @@ -321,9 +321,10 @@ while (my $_l = <$fh>) { # Luis Mondesi <lemsx1@gmail.com> my $_s = $_l; $_s =~ s/^ //g; - if ($_s =~ m/^Merge branch/) + if ($_s =~ m/^Merge branch|^Merge remote branch/) { $state=0; + $author=0; next; } $comment = $comment . $_s; |
