From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Oct 2018 12:30:46 +0000 (+0100)
Subject: dgit: -wn clean check is a no-op
X-Git-Tag: archive/debian/8.0~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=75dd5aef7f0d91ce0ac78285cc15843f686f5914

dgit: -wn clean check is a no-op

Handle this explicitly in the clean_tree_check conditional and in the
test suite.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 52ae472b..4587af25 100755
--- a/dgit
+++ b/dgit
@@ -6242,6 +6242,7 @@ sub clean_tree_check () {
 	# 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.
+    } elsif ($cleanmode eq 'none') {
     }
 }
 
diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 7d0d9fdd..78ae236f 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -158,7 +158,7 @@ bm-compute-expected () {
 			bm-build-deps-ok || tolerate_fail=tolerate
 			echo >&4 "EXAMPLE RULES TARGET clean"
 			;;
-	none)		;;
+	none|Cnone)	;;
 	Cdpkg-source*)	;; # handled below
 	Cgit|Cgit-ff)	;;
 	C*)		echo "TODO bm eff_cleanmode=$eff_cleanmode" ;;