From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Aug 2013 18:51:10 +0000 (+0100)
Subject: fix build to canonicalise
X-Git-Tag: debian/0.3^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=1ce58351167dc6e9410f07bc4989f7c21940ba22

fix build to canonicalise
---

diff --git a/dgit b/dgit
index 8b395475..ab3d593e 100755
--- a/dgit
+++ b/dgit
@@ -785,12 +785,14 @@ sub cmd_build {
     my $clogp = parsechangelog();
     $isuite = $clogp->{Distribution};
     $package = $clogp->{Source};
-    canonicalise_suite() unless grep { m/^--git-debian-branch/ } @ARGV;
-    runcmd_ordryrun
-	qw(git-buildpackage -us -uc --git-no-sign-tags),
-	'--git-builder=dpkg-buildpackage -i\.git/ -I.git',
-	"--git-debian-branch=".lbranch(),
-	@ARGV;
+    my @cmd =
+	(qw(git-buildpackage -us -uc --git-no-sign-tags),
+	 '--git-builder=dpkg-buildpackage -i\.git/ -I.git');
+    unless (grep { m/^--git-debian-branch/ } @ARGV) {
+	canonicalise_suite();
+	push @cmd, "--git-debian-branch=".lbranch();
+    }
+    runcmd_ordryrun @cmd, @ARGV;
 }
 
 sub cmd_quilt_fixup {