git-build (git-buildpackage wrapper) does not bother canonicalising the suite if...

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 1db2cdb0893108093911b78dcb460087ce89ee01..892cde2baf84b63c41fff2b42547c335814f24a0 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1063,12 +1063,21 @@ sub build_prep () {
 }
 
 sub cmd_build {
-    badusage "dgit build implies --clean=dpkg-source" if defined $package;
+    badusage "dgit build implies --clean=dpkg-source"
+       if $cleanmode ne 'dpkg-source';
+    build_prep();
+    runcmd_ordryrun @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
+    printdone "build successful\n";
+}
+
+sub cmd_git_build {
+    badusage "dgit git-build implies --clean=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();
     }