From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 28 Apr 2017 16:43:17 +0000 (+0100)
Subject: git-debrebase: abolish $pseudos_must_overwrite_this
X-Git-Tag: archive/debian/5.0~360
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f2c6ef698b8cacd4e55b09000454960f50bbc6ea

git-debrebase: abolish $pseudos_must_overwrite_this
---

diff --git a/git-debrebase b/git-debrebase
index 3469f33d..e2a1a325 100755
--- 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};