From bc95a2402f9e765113ef38d12d642a3340132049 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 23 Apr 2018 01:16:06 +0100 Subject: [PATCH] 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 --- debian/changelog | 1 + dgit | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index b6c60f78..b0fbb920 100644 --- 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 b43308df..2a581f38 100755 --- 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 <