diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-25 15:57:51 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-25 15:57:51 +0100 |
commit | afd3aa8b36b05f6cf01b17d553fc14250afacaec (patch) | |
tree | 2bf3215b30632aae64c2d001e88fa68fc394e869 | |
parent | e52f5e192421e79c6d59f33bc1dcd40272e7e91b (diff) |
Fix bug which would make quilt patch fixup fail if git status produced "M" lines.
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1e14862..66f74cf 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.) @@ -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"; |