dgit: Bail if single-debian-patch needs committing with --quilt=nofix

Also, if the user invokes dgit push with uncommitted debian/patches/.

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

diff --git a/debian/changelog b/debian/changelog
index b6c60f78e03ea14c4522a47a16fb138b4f65b187..b0fbb920243c3666542c04834bc69da786006626 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dgit (4.5~) unstable; urgency=medium
   * 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.)
+  * Respect --quilt=nofix even if single-debian-patch.
 
   Minor fixes:
   * "confess" when we die due to a warning, rather than symply dieing.

diff --git a/dgit b/dgit
index b43308df271f5819bfab10b3e3dc69ca52c0f6e5..2a581f389f25cead7ba1b4aa9e8c729b184fc9b4 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3727,6 +3727,7 @@ sub commit_quilty_patch () {
        progress "nothing quilty to commit, ok.";
        return;
     }
+    quiltify_nofix_bail "", " (wanted to commit patch update)";
     my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
     runcmd_ordryrun_local @git, qw(add -f), @adds;
     commit_admin <<END