From: Ian Jackson Date: Fri, 10 Mar 2017 18:03:47 +0000 (+0000) Subject: git-debrebase: wip, launder rm patches X-Git-Tag: archive/debian/5.0~372 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=536e29d7d60fb9eda56203d3472b2b45d387bd1c;ds=sidebyside git-debrebase: wip, launder rm patches --- diff --git a/git-debrebase b/git-debrebase index d5203877..ad26d909 100755 --- a/git-debrebase +++ b/git-debrebase @@ -487,7 +487,9 @@ sub update_head ($$) { sub cmd_launder () { my $old = get_head(); my ($tip,$breakwater) = launder $old, 0, undef, 0; - update_head $old, $tip, 'launder'; # no tree changes! xxx debian/patches + update_head $old, $tip, 'launder'; + # no tree changes except debian/patches + runcmd @git, qw(rm --quiet -rf debian/patches); printf "# breakwater tip:\n%s\n", $breakwater; }