X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=5808cf33f7f1b702f29c5e57b1ef01e707a0428f;hp=22cdfa6405b4c8c884a7f017f4e143e06658fa0c;hb=747c6f2eaf1929665a4c19ad4654bba0790b9e01;hpb=31ca5cbc38b975621d01dd5c5fd5cf6b8f539ee4

diff --git a/git-debrebase b/git-debrebase
index 22cdfa64..5808cf33 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -283,7 +283,7 @@ sub calculate_committer_authline () {
 #
 #   BreakwaterUpstreamMerge
 #     has additional entry in classification result
-#       OrigParents = [ subset of Parents ]
+#       OrigParents = [ subset of Parents ]  # singleton list
 
 sub classify ($) {
     my ($objid) = @_;
@@ -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 ?";