From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Mar 2017 17:34:22 +0000 (+0000)
Subject: remove an xxx
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=0d692393e55670f757d6f34d58e696953a9d64cf;p=dgit.git

remove an xxx
---

diff --git a/git-debrebase b/git-debrebase
index d55cdeb5..0ebd7426 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -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->();