chiark / gitweb /
git-debrebase: insist that breakwater merges are merges
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 10 Feb 2018 15:27:56 +0000 (15:27 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 28cbc88..6d8091e 100755 (executable)
@@ -375,6 +375,9 @@ sub classify ($) {
        $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));