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:
31ca5cb
)
git-debrebase: launder: debug print why rewriting if out-of-order
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 25 Oct 2017 17:37:29 +0000
(18:37 +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 22cdfa6405b4c8c884a7f017f4e143e06658fa0c..4ca30eb53e6ea3d518258fb358356dc92f5098f7 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-667,7
+667,13
@@
sub walk ($;$$) {
} else {
confess "$method ?";
}
- $rewriting ||= $cl ne pop @processed;
+ if (!$rewriting) {
+ my $procd = (pop @processed) // 'UNDEF';
+ if ($cl ne $procd) {
+ $rewriting = 1;
+ printdebug "WALK REWRITING NOW cl=$cl procd=$procd\n";
+ }
+ }
my $newtree = cmdoutput @git, qw(write-tree);
my $ch = $cl->{Hdr};
$ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";