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

diff --git a/git-debrebase b/git-debrebase
index b4eb684d..5808cf33 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -154,7 +154,8 @@ sub in_workarea ($) {
     my ($sub) = @_;
     changedir $workarea;
     my $r = eval { $sub->(); };
-    changedir $maindir;
+    { local $@; changedir $maindir; }
+    die $@ if $@;
 }
 
 sub fresh_workarea () {
@@ -282,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) = @_;
@@ -627,9 +628,14 @@ sub walk ($;$$) {
  
     my $committer_authline = calculate_committer_authline();
 
+    printdebug "WALK REBUILD $build ".(scalar @processed)."\n";
+
+    confess "internal error" unless $build eq (pop @processed)->{CommitId};
+
     in_workarea sub {
 	mkdir $rd or $!==EEXIST or die $!;
 	my $current_method;
+	runcmd @git, qw(read-tree), $build;
 	foreach my $cl (qw(Debian), (reverse @brw_cl),
 			{ SpecialMethod => 'RecordBreakwaterTip' },
 			qw(Upstream), (reverse @upp_cl)) {
@@ -640,6 +646,8 @@ sub walk ($;$$) {
 	    my $method = $cl->{SpecialMethod} // $current_method;
 	    my @parents = ($build);
 	    my $cltree = $cl->{CommitId};
+	    printdebug "WALK BUILD ".($cltree//'undef').
+		" $method (rewriting=$rewriting)\n";
 	    if ($method eq 'Debian') {
 		$read_tree_debian->($cltree);
 	    } elsif ($method eq 'Upstream') {
@@ -659,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 ?";
@@ -684,7 +698,9 @@ sub walk ($;$$) {
 	}
     };
 
-    runcmd @git, qw(diff-tree --quiet), $input, $build;
+    my $final_check = get_differs $build, $input;
+    die sprintf "internal error %#x %s %s", $final_check, $build, $input
+	if $final_check & ~D_PAT_ADD;
 
     return ($build, $breakwater);
 }
@@ -709,8 +725,9 @@ sub cmd_launder () {
     my ($tip,$breakwater) = walk $old;
     update_head $old, $tip, 'launder';
     # no tree changes except debian/patches
-    runcmd @git, qw(rm --quiet -rf debian/patches);
+    runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
     printf "# breakwater tip\n%s\n", $breakwater;
+    printf "# working tip\n%s\n", $tip;
 }
 
 sub cmd_analyse () {