From 3259a1544a034832c5cd981681ba7f166c203974 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 10 Mar 2017 17:34:22 +0000 Subject: [PATCH] git-debrebase: remove an xxx --- git-debrebase | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git-debrebase b/git-debrebase index f77566c9..c3860572 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->(); -- 2.30.2