chiark / gitweb /
Quilt linearisation with .pc removal passes -f to git-rm. (Otherwise we may find...
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 29 Jun 2015 01:10:23 +0000 (02:10 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 29 Jun 2015 01:10:23 +0000 (02:10 +0100)
debian/changelog
dgit

index a34f218..901925b 100644 (file)
@@ -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 0d558c0..8d3addb 100755 (executable)
--- 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)";
     }