chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finalise 0.11
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 03542c3d0ba3963029e73af6a0f29da8db07ad7b..892cde2baf84b63c41fff2b42547c335814f24a0 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-1064,7
+1064,7
@@
sub build_prep () {
sub cmd_build {
badusage "dgit build implies --clean=dpkg-source"
sub cmd_build {
badusage "dgit build implies --clean=dpkg-source"
- if $clean ne 'dpkg-source';
+ if $clean
mode
ne 'dpkg-source';
build_prep();
runcmd_ordryrun @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
printdone "build successful\n";
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"
sub cmd_git_build {
badusage "dgit git-build implies --clean=dpkg-source"
- if $clean ne 'dpkg-source';
+ if $clean
mode
ne 'dpkg-source';
build_prep();
my @cmd =
(qw(git-buildpackage -us -uc --git-no-sign-tags),
"--git-builder=@dpkgbuildpackage");
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();
}
canonicalise_suite();
push @cmd, "--git-debian-branch=".lbranch();
}