summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-16 16:30:57 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-16 16:30:57 +0100
commit713eaae4d3f172cca513f90c2a0a00501f440bd6 (patch)
tree1a637b2c4f8032f841c29dbc4009ac0eb07471f2
parent5884721db70238f93c16a62c0acb5ebe7c942405 (diff)
fixes, upload-host
-rwxr-xr-xdgit8
-rw-r--r--dgit.12
2 files changed, 7 insertions, 3 deletions
diff --git a/dgit b/dgit
index 0818e37..c66a001 100755
--- a/dgit
+++ b/dgit
@@ -143,7 +143,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
sub cfg {
foreach my $c (@_) {
- my $v = cmdoutput_errok(qw(git config --), $c);
+ my $v = cmdoutput_errok(@git, qw(config --), $c);
if ($?==0) {
chomp $v;
return $v;
@@ -542,7 +542,9 @@ sub dopush () {
runcmd_ordryrun @debsign_cmd;
}
runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag";
- runcmd_ordryrun @dput, $changesfile;
+ my $host = access_cfg('upload-host');
+ my @hostarg = defined($host) ? ($host,) : ();
+ runcmd_ordryrun @dput, @hostarg, $changesfile;
}
sub cmd_clone {
@@ -654,7 +656,7 @@ sub parseopts () {
} elsif (s/^-D/-/) {
open DEBUG, ">&STDERR" or die $!;
} elsif (s/^-c(.*=.*)//s) {
- push @git, $1;
+ push @git, '-c', $1;
} elsif (s/^-C(.*)//s) {
$changesfile = $1;
} elsif (s/^-k(.*)//s) {
diff --git a/dgit.1 b/dgit.1
index 84e5469..feb6d7a 100644
--- a/dgit.1
+++ b/dgit.1
@@ -158,6 +158,8 @@ on the dgit command line.
.TP
.BI dgit-distro. distro .git-create
.TP
+.BI dgit-distro. distro .upload-host
+.TP
.BI dgit-distro. distro .ssh
.TP
.BR dgit.default. *