From 713eaae4d3f172cca513f90c2a0a00501f440bd6 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Aug 2013 16:30:57 +0100
Subject: fixes, upload-host

---
 dgit | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'dgit')

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) {
-- 
cgit v1.2.3