X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=892cde2baf84b63c41fff2b42547c335814f24a0;hp=1db2cdb0893108093911b78dcb460087ce89ee01;hb=b1f6740e928e0deeb680b12a59d5b12899063320;hpb=69c5b89e545bb8276b1bb20f399b8df75607d868 diff --git a/dgit b/dgit index 1db2cdb0..892cde2b 100755 --- 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(); }