From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Feb 2018 14:14:03 +0000 (+0000)
Subject: dgit: In quilt_fixup_multipatch, work around git checkout paths
X-Git-Tag: archive/debian/5.0~394
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=384c846711061bebb4cda6567553bc0f910a69cf

dgit: In quilt_fixup_multipatch, work around git checkout paths

git checkout paths does not delete files.
This is a hypothetical bug AFAIAA.

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

diff --git a/debian/changelog b/debian/changelog
index 91dd7c49..a3404138 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dgit (4.5~) unstable; urgency=medium
 
   Bugfixes:
   * When checking that the tree is clean, check the git index too.
+  * In quilt_fixup_multipatch, work around git checkout paths
+    not deleting files.  (Hypothetical bug AFAIAA.)
 
   Minor fixes:
   * "confess" when we die due to a warning, rather than symply dieing.
diff --git a/dgit b/dgit
index 17e4fadb..49350ee7 100755
--- a/dgit
+++ b/dgit
@@ -5701,6 +5701,7 @@ sub quilt_fixup_multipatch ($$$) {
 
     rmtree '.pc';
 
+    rmtree 'debian'; # git checkout commitish paths does not delete!
     runcmd @git, qw(checkout -f), $headref, qw(-- debian);
     my $unapplied=git_add_write_tree();
     printdebug "fake orig tree object $unapplied\n";