diff options
-rw-r--r-- | debian/changelog | 3 | ||||
-rwxr-xr-x | dgit | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a34f218..901925b 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 @@ -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)"; } |