summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-13 13:29:01 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-13 16:46:47 +0100
commitbf3b5ae6ed289e7b1d43559700d1bdf3be8b38a7 (patch)
tree5574d4b0d1ffa823b9696a63f90c192c65f9c393 /dgit
parent17828118c396929e9a95dbd4d1efd58b747add95 (diff)
dgit: -wg / -wgf clean check is a no-op
Document this, and handle it explicitly in the clean_tree_check conditional and in the test suite. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit4
1 files changed, 4 insertions, 0 deletions
diff --git a/dgit b/dgit
index e88af4e..52ae472 100755
--- a/dgit
+++ b/dgit
@@ -6238,6 +6238,10 @@ sub clean_tree_check () {
} elsif ($cleanmode =~ m{^dpkg-source}) {
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.
}
}