git-debrebase: read_tree_upstream: New option $keep_patches

NFC with existing callers.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index ad20e4b6dce45a4d0439d32e850de703cee412db..66cbb58ecc58c24c9b0b1a59ef3d659d4e92c3c8 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -261,12 +261,12 @@ sub read_tree_debian ($) {
     rm_subdir_cached 'debian/patches';
 }
 
-sub read_tree_upstream ($) {
-    my ($treeish) = @_;
+sub read_tree_upstream ($;$) {
+    my ($treeish, $keep_patches) = @_;
     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';
+    rm_subdir_cached 'debian/patches' unless $keep_patches;
 };
 
 sub make_commit ($$) {