From f15061e0b700cc7102eee181b022070a18927039 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 13 Oct 2018 11:38:30 +0100 Subject: dgit: clean_tree_check: Reorganise command construction This will make it easier to make the command vary. No functional change. Signed-off-by: Ian Jackson --- dgit | 4 +++- tests/lib-build-modes | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index 1d0fe85..6cf10fb 100755 --- a/dgit +++ b/dgit @@ -6205,7 +6205,9 @@ sub clean_tree_check () { # That was done by check_not_dirty, and by now we may have run # the rules clean target which might modify tracked files (!) if ($cleanmode =~ m{^check}) { - my $leftovers = cmdoutput @git, qw(clean -xdn); + my @cmd = (@git, qw(clean -dn)); + push @cmd, qw(-x); + my $leftovers = cmdoutput @cmd; if (length $leftovers) { print STDERR $leftovers, "\n" or confess $!; fail __ diff --git a/tests/lib-build-modes b/tests/lib-build-modes index 5e186b2..403d8b2 100644 --- a/tests/lib-build-modes +++ b/tests/lib-build-modes @@ -148,7 +148,7 @@ bm-compute-expected () { case $eff_cleanmode in git) echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;; git-ff) echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;; - check|Ccheck) echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;; + check|Ccheck) echo >&4 'BUILD-MODES PROGRAM git clean -dn -x' ;; dpkg-source-d) echo >&4 "EXAMPLE RULES TARGET clean" ;; dpkg-source) bm-build-deps-ok || tolerate_fail=tolerate echo >&4 "EXAMPLE RULES TARGET clean" -- cgit v1.2.3