summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-25 15:57:51 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-25 15:57:51 +0100
commitafd3aa8b36b05f6cf01b17d553fc14250afacaec (patch)
tree2bf3215b30632aae64c2d001e88fa68fc394e869 /dgit
parente52f5e192421e79c6d59f33bc1dcd40272e7e91b (diff)
Fix bug which would make quilt patch fixup fail if git status produced "M" lines.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index d2a52f6..878065f 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";