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 ($$) {