git-debrebase: introduce $claims_to_be_breakwater (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index bc92cfab4b88d08cb874a79c0413bbb95bfab81d..28cbc8891ba1400aff860309af1db841ac189d09 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -371,6 +371,9 @@ sub classify ($) {
        return $r;
     };
 
+    my $claims_to_be_breakwater =
+       $r->{Msg} =~ m{^\[git-debrebase breakwater.*\]$}m;
+
     if (@p == 1) {
        my $d = $r->{Parents}[0]{Differs};
        if ($d == D_PAT_ADD) {
@@ -405,8 +408,7 @@ sub classify ($) {
     }
 
     my @identical = grep { !$_->{Differs} } @p;
-    if (@p == 2 && @identical == 1 &&
-       $r->{Msg} !~ m{^\[git-debrebase breakwater.*\]$}m
+    if (@p == 2 && @identical == 1 && !$claims_to_be_breakwater
        # breakwater merges can look like pseudomerges, if they are
        # "declare" commits (ie, there are no upstream changes)
        ) {