From afd3aa8b36b05f6cf01b17d553fc14250afacaec Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 25 Aug 2013 15:57:51 +0100
Subject: [PATCH] Fix bug which would make quilt patch fixup fail if git status
 produced "M" lines.

---
 debian/changelog | 2 ++
 dgit             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1e148620..66f74cfb 100644
--- 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 d2a52f62..878065ff 100755
--- 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";
-- 
2.30.2