X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=892cde2baf84b63c41fff2b42547c335814f24a0;hb=6c76888733aa16153f6490fdf44569f54d316c74;hp=03542c3d0ba3963029e73af6a0f29da8db07ad7b;hpb=fcfb9c26e444f643f44789618d1f1ebc25429ac4;p=dgit.git

diff --git a/dgit b/dgit
index 03542c3d..892cde2b 100755
--- a/dgit
+++ b/dgit
@@ -1064,7 +1064,7 @@ sub build_prep () {
 
 sub cmd_build {
     badusage "dgit build implies --clean=dpkg-source"
-	if $clean ne 'dpkg-source';
+	if $cleanmode ne 'dpkg-source';
     build_prep();
     runcmd_ordryrun @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
     printdone "build successful\n";
@@ -1072,12 +1072,12 @@ sub cmd_build {
 
 sub cmd_git_build {
     badusage "dgit git-build implies --clean=dpkg-source"
-	if $clean ne 'dpkg-source';
+	if $cleanmode ne 'dpkg-source';
     build_prep();
     my @cmd =
 	(qw(git-buildpackage -us -uc --git-no-sign-tags),
 	 "--git-builder=@dpkgbuildpackage");
-    unless (grep { m/^--git-debian-branch/ } @ARGV) {
+    unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
 	canonicalise_suite();
 	push @cmd, "--git-debian-branch=".lbranch();
     }