Quilt linearisation with .pc removal passes -f to git-rm. (Otherwise we may find...

diff --git a/debian/changelog b/debian/changelog
index a34f21866989c8deb9a88ca0652e60988ec40410..901925b507f5f58417e6bcfc69e043b7c6b78c92 100644 (file)
--- 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.
 
   * 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
  --
 
 dgit (0.22.1) unstable; urgency=high

diff --git a/dgit b/dgit
index 0d558c0c8882f0a630d32678486aad123e8719d5..8d3addbb3be91082514a3e8a5f33765f5e732020 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2478,7 +2478,7 @@ END
     commit_quilty_patch();
 
     if ($mustdeletepc) {
     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)";
     }
 
         commit_admin "Commit removal of .pc (quilt series tracking data)";
     }