From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Jan 2014 01:09:13 +0000 (+0000)
Subject: Refuse to do quilt fixup (explicitly or as a result of build). Closes:#731632.
X-Git-Tag: debian/0.21~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=c2a0ff7beedc33a80fa2e1eb4d09d7da170b0eb7

Refuse to do quilt fixup (explicitly or as a result of build). Closes:#731632.
---

diff --git a/debian/changelog b/debian/changelog
index bfdb0e9d..594eadaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ dgit (0.21~~iwj) unstable; urgency=low
   * Run a clean (of the specified type) before any build operation; do
     this with `dpkg-buildpackage -T' clean if necessary, so -wd now works
     with all the building methods.
+  * Refuse to do quilt fixup (explicitly or as a result of build).
+    Closes:#731632.
 
  --
 
diff --git a/dgit b/dgit
index 7752d824..5c0ea82f 100755
--- a/dgit
+++ b/dgit
@@ -1734,6 +1734,17 @@ sub build_maybe_quilt_fixup () {
     chomp;
     return unless madformat($_);
     # sigh
+    
+    my @cmd = (@git, qw(ls-files --exclude-standard -iodm));
+    my $problems = cmdoutput @cmd;
+    if (length $problems) {
+	print STDERR "problematic files:\n";
+	print STDERR "  $_\n" foreach split /\n/, $problems;
+	fail "Cannot do quilt fixup in tree containing ignored files.  ".
+	    "Perhaps your package's clean target is broken, in which".
+	    " case -wg (which says to use git-clean -xdf) may help.";
+    }
+
     my $clogp = parsechangelog();
     my $version = getfield $clogp, 'Version';
     my $author = getfield $clogp, 'Maintainer';