chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f13c44
)
git-debrebase: abolish $pseudos_must_overwrite_this
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 28 Apr 2017 16:43:17 +0000
(17:43 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +0100)
git-debrebase
patch
|
blob
|
history
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");
}
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
$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') {
$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};
push @pseudomerges, $cl;
$rewrite_from_here->();
$cur = $ty->{Contributor};