From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 27 Jul 2015 11:00:38 +0000 (+0100)
Subject: Also suppress spurious runs of the clean target when building using git-buildpackage.
X-Git-Tag: debian/1.1~14
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=94f1626bbddaae07cb56b86dc83a5a5de34f642b

Also suppress spurious runs of the clean target when building using git-buildpackage.
---

diff --git a/debian/changelog b/debian/changelog
index 2f296309..7e17a8fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ dgit (1.1~~) unstable; urgency=low
     than running it twice.  When we are _not_ supposed to be using
     dpkg-buildpackage to clean, but we are running it to do the build,
     pass -nc.
+  * Also suppress spurious runs of the clean target when building using
+    git-buildpackage.
 
  --
 
diff --git a/dgit b/dgit
index 22a1ccd0..ad460d14 100755
--- a/dgit
+++ b/dgit
@@ -2973,10 +2973,15 @@ sub cmd_build {
 sub cmd_gbp_build {
     my @dbp = @dpkgbuildpackage;
     massage_dbp_args \@dbp;
-    build_prep();
     my @cmd =
 	(qw(git-buildpackage -us -uc --git-no-sign-tags),
 	 "--git-builder=@dbp");
+    if ($cleanmode eq 'dpkg-source') {
+	$suppress_clean = 1;
+    } else {
+	push @cmd, '--git-cleaner=true';
+    }
+    build_prep();
     unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
 	canonicalise_suite();
 	push @cmd, "--git-debian-branch=".lbranch();