diff options
-rwxr-xr-x | git-debrebase | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 22cdfa6..4ca30eb 100755 --- 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 ?"; |