X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=git-debrebase;h=c8ee5e549b2acafc0794db85561dd7c66c40583f;hb=cb5a33d8508c3b83a2bb776e567d8cd2d1a6e50d;hp=60ea976116fa1afad615a8c8be17e2171b55d7bf;hpb=5f0580a8bbf6460363d208acfab53714f190a7a6;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 60ea9761..c8ee5e54 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1276,6 +1276,11 @@ sub walk ($;$$$) {
 
     my $rewriting = 0;
 
+    my $read_tree_upstream = sub {
+	my ($treeish) = @_;
+	read_tree_upstream $treeish, 0, $build;
+    };
+
     $#upp_cl = $upp_limit if defined $upp_limit;
  
     my $committer_authline = calculate_committer_authline();
@@ -1303,7 +1308,7 @@ sub walk ($;$$$) {
 	    if ($method eq 'Debian') {
 		read_tree_debian($cltree);
 	    } elsif ($method eq 'Upstream') {
-		read_tree_upstream($cltree);
+		$read_tree_upstream->($cltree);
 	    } elsif ($method eq 'StartRewrite') {
 		$rewriting = 1;
 		next;
@@ -1316,13 +1321,13 @@ sub walk ($;$$$) {
  		confess unless $rewriting;
 		my $differs = (get_differs $build, $cltree);
 		next unless $differs & D_UPS;
-		read_tree_upstream($cltree);
+		$read_tree_upstream->($cltree);
 		push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
 	    } elsif ($method eq 'MergeCreateMergedBreakwaters') {
 		print "Found a general merge, will try to tidy it up.\n";
 		$rewriting = 1;
-		read_tree_upstream($cl->{MergeBestAnchor});
-		read_tree_upstream($cl->{MergeBestAnchor});
+		$read_tree_upstream->($cl->{MergeBestAnchor});
+		$read_tree_upstream->($cl->{MergeBestAnchor});
 		read_tree_debian($cltree);
 		@parents = map { $_->{Breakwater} } @{ $cl->{Parents} };
 	    } elsif ($method eq 'MergeMergeSeries') {