git-debrebase: note that we have mostly done the gbp import

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index bc92cfab4b88d08cb874a79c0413bbb95bfab81d..6d8091e63bfb880b42a56aa1387d8d0b1a0aacfd 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -371,7 +371,13 @@ sub classify ($) {
        return $r;
     };
 
+    my $claims_to_be_breakwater =
+       $r->{Msg} =~ m{^\[git-debrebase breakwater.*\]$}m;
+
     if (@p == 1) {
+       if ($claims_to_be_breakwater) {
+           return $unknown->("single-parent git-debrebase breakwater \`merge'");
+       }
        my $d = $r->{Parents}[0]{Differs};
        if ($d == D_PAT_ADD) {
            return $classify->(qw(AddPatches));
@@ -405,8 +411,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)
        ) {