From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Aug 2013 15:30:57 +0000 (+0100)
Subject: fixes, upload-host
X-Git-Tag: debian/0.2~20
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=713eaae4d3f172cca513f90c2a0a00501f440bd6

fixes, upload-host
---

diff --git a/dgit b/dgit
index 0818e371..c66a0014 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 84e54695..feb6d7a5 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. *