git-debrebase: abolish $pseudos_must_overwrite_this

diff --git a/git-debrebase b/git-debrebase
index 3469f33d0a0ef285e17d2a04ff34df4ec6fdff66..e2a1a325ed3bb02fa978483f4965bd0610a8710a 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -300,8 +300,8 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub walk ($$$;$$$) {
-    my ($input, $pseudos_must_overwrite_this, $wantdebonly,
+sub walk ($$;$$$) {
+    my ($input, $wantdebonly,
        $report, $depth, $report_anomaly, $report_only) = @_;
     # go through commits backwards
     # we generate two lists of commits to apply
@@ -362,16 +362,6 @@ sub walk ($$$;$$$) {
            $rewrite_from_here->();
            next;
        } elsif ($ty eq 'Pseudomerge') {
-           if (defined $pseudos_must_overwrite_this &&
-               !grep {
-                   is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
-               },
-               @{ $cl->{Overwritten} }) {
-               $report_anomaly->($cl,
-                                 "Pseudomerge should overwrite".
-                                 " $pseudos_must_overwrite_this".
-                                 " but does not do so");
-           }
            push @pseudomerges, $cl;
            $rewrite_from_here->();
            $cur = $ty->{Contributor};