Fix skipping of merge commits in log convert script.

14 years ago · 8a2183b2d9
parent eeafad20bf
commit 8a2183b2d9
1 changed files with 2 additions and 1 deletions
--- 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;