From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 29 Jun 2015 01:10:23 +0000 (+0100)
Subject: Quilt linearisation with .pc removal passes -f to git-rm.  (Otherwise we may find... 
X-Git-Tag: debian/0.30~38
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=945c491a13e336fc6a42ddb85be688b1ca8b4b7b;ds=sidebyside

Quilt linearisation with .pc removal passes -f to git-rm.  (Otherwise we may find that .pc/applied_patches prevents the commit.)
---

diff --git a/debian/changelog b/debian/changelog
index a34f2186..901925b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,6 +70,9 @@ dgit (0.23~) unstable; urgency=low
   * Fix an undef reference in error message processing when quilt
     fixup linearisation fails.
 
+  * Quilt linearisation with .pc removal passes -f to git-rm.  (Otherwise
+    we may find that .pc/applied_patches prevents the commit.)
+
  --
 
 dgit (0.22.1) unstable; urgency=high
diff --git a/dgit b/dgit
index 0d558c0c..8d3addbb 100755
--- a/dgit
+++ b/dgit
@@ -2478,7 +2478,7 @@ END
     commit_quilty_patch();
 
     if ($mustdeletepc) {
-        runcmd @git, qw(rm -rq .pc);
+        runcmd @git, qw(rm -rqf .pc);
         commit_admin "Commit removal of .pc (quilt series tracking data)";
     }