chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit, git-debrebase: Properly make patches with nasty .gitignores.
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 3a737d0b0bbd607dc002542fdd9f582bf14edfaa..0d36361f2609a4d18f40e6e873c9ba262337202a 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-3812,11
+3812,11
@@
sub quiltify_nofix_bail ($$) {
}
sub commit_quilty_patch () {
}
sub commit_quilty_patch () {
- my $output = cmdoutput @git, qw(status --porcelain);
+ my $output = cmdoutput @git, qw(status --
ignored --
porcelain);
my %adds;
foreach my $l (split /\n/, $output) {
next unless $l =~ m/\S/;
my %adds;
foreach my $l (split /\n/, $output) {
next unless $l =~ m/\S/;
- if ($l =~ m{^(?:
\?\?
| [MADRC]) (.pc|debian/patches)}) {
+ if ($l =~ m{^(?:
[?!][?!]
| [MADRC]) (.pc|debian/patches)}) {
$adds{$1}++;
}
}
$adds{$1}++;
}
}
@@
-5318,7
+5318,7
@@
END
print SERIES "\n" or die $! unless $newline eq "\n";
print SERIES "auto-gitignore\n" or die $!;
close SERIES or die $!;
print SERIES "\n" or die $! unless $newline eq "\n";
print SERIES "auto-gitignore\n" or die $!;
close SERIES or die $!;
- runcmd @git, qw(add -- debian/patches/series), $gipatch;
+ runcmd @git, qw(add -
f -
- debian/patches/series), $gipatch;
commit_admin <<END
Commit patch to update .gitignore
commit_admin <<END
Commit patch to update .gitignore