X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=8c7f288a75597f8086d02ecb25a3be1a43416226;hp=de14c1ef0478eade067b3c5c4797629dbcf63d0a;hb=0457c2d771ef6fe6c0883344add9dd4da0c60917;hpb=7053910ee1c73badd2df933b28e5fdad8eee161f

diff --git a/dgit b/dgit
index de14c1ef..8c7f288a 100755
--- a/dgit
+++ b/dgit
@@ -7355,7 +7355,10 @@ sub parseopts_late_defaults () {
 
     if (!defined $cleanmode) {
 	local $access_forpush;
-	$cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
+	$cleanmode = access_cfg('clean-mode-newer', 'RETURN-UNDEF');
+	$cleanmode = undef if $cleanmode && $cleanmode !~ m/^$cleanmode_re$/;
+
+	$cleanmode //= access_cfg('clean-mode', 'RETURN-UNDEF');
 	$cleanmode //= 'dpkg-source';
 
 	badcfg f_ "unknown clean-mode \`%s'", $cleanmode unless