diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-04-28 17:43:17 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | f2c6ef698b8cacd4e55b09000454960f50bbc6ea (patch) | |
tree | 2c355fef1fa0bf4d15b32302450e44640cde54cf | |
parent | 9f13c444cdf81783a383787f3b8ae5deedbd59d7 (diff) |
git-debrebase: abolish $pseudos_must_overwrite_this
-rwxr-xr-x | git-debrebase | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/git-debrebase b/git-debrebase index 3469f33..e2a1a32 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}; |