From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 30 Jan 2018 18:46:20 +0000 (+0000)
Subject: git-debrebase: drop d/patches from all laundered commits
X-Git-Tag: archive/debian/5.0~292
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8d534ac9006cef95a5b2e9e882039bcabb945543;p=dgit.git

git-debrebase: drop d/patches from all laundered commits

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

diff --git a/git-debrebase b/git-debrebase
index 8c77dbcc..dc55df8c 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -657,6 +657,7 @@ sub walk ($;$$) {
     my $read_tree_debian = sub {
 	my ($treeish) = @_;
 	read_tree_subdir 'debian', "$treeish:debian";
+        rm_subdir_cached 'debian/patches';
     };
     my $read_tree_upstream = sub {
 	my ($treeish) = @_;