chiark / gitweb /
git-debrebase: remove an xxx
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 10 Mar 2017 17:34:22 +0000 (17:34 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
git-debrebase

index f77566c9efd482e17c8f490bd5f2c054a861aad8..c386057270b46908b8c47441692bb0ec14fc9c12 100755 (executable)
@@ -340,7 +340,13 @@ sub launder ($$$) {
            next;
        } elsif ($ty eq 'Pseudomerge') {
            if (defined $pseudos_must_overwrite_this) {
-               confess 'xxx actually check this';
+               grep {
+                   is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
+               },
+                   @{ $cl->{Overwritten} }
+               or
+                   die "Pseudomerge $cl->{CommitId} does not overwrite ".
+                       "$pseudos_must_overwrite_this as expected.";
            }
            push @pseudomerges, $cl;
            $rewrite_from_here->();