dgit: clean_tree_check: Reorganise command construction

[dgit.git] / dgit

diff --git a/dgit b/dgit
index b4943a23d70118c7c177b737798e40b6622f6679..6cf10fb4deb2f6add3a267532a207ab193f33e84 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -6200,7 +6200,20 @@ sub maybe_unapply_patches_again () {
 #----- other building -----
 
 sub clean_tree_check () {
-    # Not yet implemented.  The lack of this is part of #910705.
+    # Not yet fully implemented.
+    # This function needs to not care about modified but tracked files.
+    # 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 @cmd = (@git, qw(clean -dn));
+       push @cmd, qw(-x);
+       my $leftovers = cmdoutput @cmd;
+       if (length $leftovers) {
+           print STDERR $leftovers, "\n" or confess $!;
+           fail __
+ "tree contains uncommitted files and --clean=check specified";
+       }
+    }
 }
 
 sub clean_tree () {
@@ -6216,13 +6229,8 @@ sub clean_tree () {
        runcmd_ordryrun_local @git, qw(clean -xdf);
     } elsif ($cleanmode eq 'git-ff') {
        runcmd_ordryrun_local @git, qw(clean -xdff);
-    } elsif ($cleanmode eq 'check') {
-       my $leftovers = cmdoutput @git, qw(clean -xdn);
-       if (length $leftovers) {
-           print STDERR $leftovers, "\n" or confess $!;
-           fail __
- "tree contains uncommitted files and --clean=check specified";
-       }
+    } elsif ($cleanmode =~ m{^check}) {
+       clean_tree_check();
     } elsif ($cleanmode eq 'none') {
     } else {
        die "$cleanmode ?";