diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-03-10 17:34:22 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 3259a1544a034832c5cd981681ba7f166c203974 (patch) | |
tree | 3cd112ca55e40e16266730ddd5d5ebbf4d1de5fb /git-debrebase | |
parent | b277db469c8d5a02132ef4a52cf2abea6305fcee (diff) |
git-debrebase: remove an xxx
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index f77566c..c386057 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->(); |