Format `(3.0) quilt' fixup does not mind extraneous other files in the build tree...

diff --git a/debian/changelog b/debian/changelog
index 0a499cb099adbffc8083c1e83b8bae8bf2c4c276..63d9a8a62db5ea54580e5f085a55581e8cd09e35 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 dgit (0.16) unstable; urgency=low
 
+  * Format `(3.0) quilt' fixup does not mind extraneous other files
+    in the build tree (e.g., build products and logs).  Closes: #727053.
   * Set autoflush on stdout, to get better ordering of debugging
     etc. output when stdout is redirected.
   * New --damp-run mode, for more convenient and fuller testing etc.

diff --git a/dgit b/dgit
index 3c13d79f66182a9579b6f56268161f6c9d9e3716..ba5f1ba8295c6b8d176411eddf3599d3786ea73b 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -871,17 +871,12 @@ sub check_not_dirty () {
 sub commit_quilty_patch () {
     my $output = cmdoutput @git, qw(status --porcelain);
     my %adds;
-    my $bad=0;
     foreach my $l (split /\n/, $output) {
        next unless $l =~ m/\S/;
        if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
            $adds{$1}++;
-       } else {
-           print STDERR "git status: $l\n";
-           $bad++;
        }
     }
-    fail "unexpected output from git status (is tree clean?)" if $bad;
     if (!%adds) {
        print "nothing quilty to commit, ok.\n";
        return;