chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix bug which would make quilt patch fixup fail if git status produced "M" lines.
[dgit.git]
/
dgit
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";