X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=9c1f3e51e02d3697ec2a0b3875eabe0568ca4dc7;hp=a443e5d3c93e0984991b0e678723b5f893bff507;hb=cadb4c6130bb56b2be42c8efdbcbfbf9e2e1423f;hpb=e89cc82116db7648b78941ca028c24d0b5675ae4

diff --git a/dgit b/dgit
index a443e5d3..9c1f3e51 100755
--- a/dgit
+++ b/dgit
@@ -6199,14 +6199,9 @@ sub maybe_unapply_patches_again () {
 
 #----- other building -----
 
-our $clean_using_builder;
-# ^ tree is to be cleaned by dpkg-source's builtin idea that it should
-#   clean the tree before building (perhaps invoked indirectly by
-#   whatever we are using to run the build), rather than separately
-#   and explicitly by us.
-
 sub clean_tree () {
-    return if $clean_using_builder;
+    # We always clean the tree ourselves, rather than leave it to the
+    # builder (dpkg-source, or soemthing which calls dpkg-source).
     if ($cleanmode eq 'dpkg-source') {
 	maybe_apply_patches_dirtily();
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
@@ -6548,9 +6543,7 @@ sub cmd_gbp_build {
 	build_source();
 	midbuild_checkchanges_vanilla $wantsrc;
     } else {
-	if (!$clean_using_builder) {
-	    push @cmd, '--git-cleaner=true';
-	}
+	push @cmd, '--git-cleaner=true';
     }
     maybe_unapply_patches_again();
     if ($wantsrc & WANTSRC_BUILDER) {