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:
96b381f
)
remove an xxx
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 10 Mar 2017 17:34:22 +0000
(17:34 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 19 Jan 2018 18:06:44 +0000
(18:06 +0000)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index d55cdeb5326f40b9c9a199c73c49721f842e9caa..0ebd7426bf6ab85b3c26452b79dfbfbe2b591cbe 100755
(executable)
--- 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->();