diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-10 15:25:31 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 10:01:47 +0100 |
| commit | 39003be207b8d6fe57206373587b57c20a38b06f (patch) | |
| tree | 3ae0081440e81331954544006d9d1512c51840e2 /git-debrebase | |
| parent | 9145241120781f5274cbccd8359d38d209a83dca (diff) | |
git-debrebase: read_tree_upstream: New option $keep_patches
NFC with existing callers.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index ad20e4b..66cbb58 100755 --- 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 ($$) { |