From dfc092e0ec3d932e51a071000519477d0e33525c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Aug 2018 14:28:50 +0100
Subject: [PATCH] git-debrebase: Make read_tree_upstream global (nfc)

Save debian/ explicitly.  This is a bit annoying.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/git-debrebase b/git-debrebase
index 1a79a280..f4602d54 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -261,6 +261,14 @@ sub read_tree_debian ($) {
     rm_subdir_cached 'debian/patches';
 }
 
+sub read_tree_upstream ($) {
+    my ($treeish) = @_;
+    my $save = cmdoutput @git, qw(write-tree --prefix=debian/);
+    runcmd @git, qw(read-tree), $treeish;
+    read_tree_subdir 'debian', $save;
+    rm_subdir_cached 'debian/patches';
+};
+
 sub make_commit ($$) {
     my ($parents, $message_paras) = @_;
     my $tree = cmdoutput @git, qw(write-tree);
@@ -873,12 +881,6 @@ sub walk ($;$$$) {
 
     my $rewriting = 0;
 
-    my $read_tree_upstream = sub {
-	my ($treeish) = @_;
-	runcmd @git, qw(read-tree), $treeish;
-	read_tree_debian($build);
-    };
-
     $#upp_cl = $upp_limit if defined $upp_limit;
  
     my $committer_authline = calculate_committer_authline();
@@ -906,7 +908,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;
@@ -919,7 +921,7 @@ 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} };
 	    } else {
 		confess "$method ?";
-- 
2.30.2