diff options
| -rwxr-xr-x | dgit | 6 | ||||
| -rw-r--r-- | tests/lib-build-modes | 2 |
2 files changed, 3 insertions, 5 deletions
@@ -6238,7 +6238,6 @@ END } sub clean_tree_check () { - # 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 (!) @@ -6249,9 +6248,8 @@ sub clean_tree_check () { clean_tree_check_git_wd __ "tree contains uncommitted files (NB dgit didn't run rules clean)"; } elsif ($cleanmode =~ m{^git}) { - # If we were actually cleaning these files would be summarily - # deleted. Since we're not, and not using the working tree - # anyway, we can just ignore them - nothing will use them. + clean_tree_check_git_wd __ + "tree contains uncommitted files"; } elsif ($cleanmode eq 'none') { } else { confess "$cleanmode ?"; diff --git a/tests/lib-build-modes b/tests/lib-build-modes index bc8b2aa..8c05af6 100644 --- a/tests/lib-build-modes +++ b/tests/lib-build-modes @@ -160,7 +160,7 @@ bm-compute-expected () { ;; none|Cnone) ;; Cdpkg-source*) ;; # handled below - Cgit|Cgit-ff) ;; + Cgit|Cgit-ff) echo >&4 'BUILD-MODES PROGRAM git clean -dn' ;; *) fail "t-compute-expected-run $cleanmode ??" ;; esac |