summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit7
1 files changed, 5 insertions, 2 deletions
diff --git a/dgit b/dgit
index 351e089..7eb0531 100755
--- a/dgit
+++ b/dgit
@@ -103,7 +103,7 @@ our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
our $suite_re = '[-+.0-9a-z]+';
our $cleanmode_re = qr{(?: dpkg-source (?: -d )?
| git | git-ff
- | check
+ | check (?: ,ignores )?
| none
)}x;
@@ -6210,7 +6210,7 @@ sub clean_tree_check () {
# the rules clean target which might modify tracked files (!)
if ($cleanmode =~ m{^check}) {
my @cmd = (@git, qw(clean -dn));
- push @cmd, qw(-x);
+ push @cmd, qw(-x) unless $cleanmode =~ m{ignores};
my $leftovers = cmdoutput @cmd;
if (length $leftovers) {
print STDERR $leftovers, "\n" or confess $!;
@@ -7266,6 +7266,9 @@ sub parseopts () {
} elsif (s/^-wc$//s) {
push @ropts, $&;
$cleanmode = 'check';
+ } elsif (s/^-wci$//s) {
+ push @ropts, $&;
+ $cleanmode = 'check,ignores';
} elsif (s/^-c([^=]*)\=(.*)$//s) {
push @git, '-c', $&;
$gitcfgs{cmdline}{$1} = [ $2 ];