git-debrebase: fix misdetection of breakwater declarations as other pseudomerges

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

diff --git a/git-debrebase b/git-debrebase
index 87928bc55db59739c1ec7875826f1969e48641a9..bc92cfab4b88d08cb874a79c0413bbb95bfab81d 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -405,7 +405,11 @@ sub classify ($) {
     }
 
     my @identical = grep { !$_->{Differs} } @p;
-    if (@p == 2 && @identical == 1) {
+    if (@p == 2 && @identical == 1 &&
+       $r->{Msg} !~ m{^\[git-debrebase breakwater.*\]$}m
+       # breakwater merges can look like pseudomerges, if they are
+       # "declare" commits (ie, there are no upstream changes)
+       ) {
        my @overwritten = grep { $_->{Differs} } @p;
        confess "internal error $objid ?" unless @overwritten==1;
        return $classify->(qw(Pseudomerge),