Update2: An attempt at better recognition of merges

Merge log messages are more complex than I previously thought.

diff --git a/update2 b/update2
index 7d628533510d733fd28b2d31d9b954516cea1f66..d0e05fb428ca60bbd68fff92befad4721b2aeffa 100755 (executable)
--- a/update2
+++ b/update2
@@ -124,10 +124,15 @@ sub update_branch($$$$$)
                        my $c0 = $commits[0];
                        my $n0 = $nonmerges[0];
                        my $c0p = $c0->{parents};
+
                        if (@{$c0p} == 2 &&
                            ($c0p->[0] eq $old || $c0p->[1] eq $old) &&
-                           $c0->{subject} =~ m{^\s*Merge branch '([^']*)' into (\S+)} &&
-                           (($1 eq $branch) != ($2 eq $branch))) {
+                           (
+                               $c0->{subject} =~ m{^\s*Merge branch '([^']*)' into (\S+)} &&
+                               ($1 eq $branch) != ($2 eq $branch)
+                           ) || (
+                               $c0->{subject} =~ m{^\s*Merge branch '([^']*)'( of |$)}
+                           )) {
                                # Pushed a merge of the current branch with another local branch
                                $subj .= ' ' . $c0->{subject};
                        } elsif ($n0) {