X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=5c0ea82facc28e39a92a59542af46574f7133942;hp=7752d824f6c30023304ac8a0716d84f67d41a2eb;hb=c2a0ff7beedc33a80fa2e1eb4d09d7da170b0eb7;hpb=5dbf5d3d2ef07b059c732abe77d1657e3fc3f714

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';