Fix bug which would make quilt patch fixup fail if git status produced "M" lines.

diff --git a/debian/changelog b/debian/changelog
index 1e1486201d85132159e23e502f3c71ed118db743..66f74cfba2fb0b33f1f5e3ff8921749f6588a55c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 dgit (0.11) unstable; urgency=low
 
+  * Fix bug which would make quilt patch fixup fail if git status
+    produced "M" lines.
   * Use "ftp.debian.org" not "http.debian.net" as the default Debian
     archive.  (http.debian.net tends to defeat certain kinds of cacheing,
     and can also have more skew.)

diff --git a/dgit b/dgit
index d2a52f6231935b2d1066cce8b811e63f12389588..878065fff06eaaf1bc49993be180f39ae79790e8 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -763,7 +763,7 @@ sub commit_quilty_patch () {
     my $bad=0;
     foreach my $l (split /\n/, $output) {
        next unless $l =~ m/\S/;
-       if ($l =~ m{^\?\? (.pc|debian/patches)}) {
+       if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
            $adds{$1}++;
        } else {
            print STDERR "git status: $l\n";