X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=faffba6202a0cc6d0f6616a494aae807355eaa70;hb=9308011c98e2dc4d930efb0991fe92467c23c4ad;hp=70ff8c4b7a6a351bf866feb111956388b6ad8721;hpb=196d61f51d2191bf44d5bfe0ccb4456a59f0446a;p=dgit.git

diff --git a/dgit b/dgit
index 70ff8c4b..faffba62 100755
--- a/dgit
+++ b/dgit
@@ -444,12 +444,15 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit.default.archive-query' => 'madison:',
 	       'dgit.default.sshpsql-dbname' => 'service=projectb',
 	       'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
-	       'dgit-distro.debian.git-host' => 'dgit-git.debian.net',
-	       'dgit-distro.debian.git-user-force' => 'dgit',
-	       'dgit-distro.debian.git-proto' => 'git+ssh://',
-	       'dgit-distro.debian.git-path' => '/dgit/debian/repos',
-	       'dgit-distro.debian.git-create' => 'true',
-	       'dgit-distro.debian.git-check' => 'ssh-cmd',
+	       'dgit-distro.debian.git-check' => 'url',
+	       'dgit-distro.debian.git-check-suffix' => '/info/refs',
+	       'dgit-distro.debian/push.git-url' => '',
+	       'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
+	       'dgit-distro.debian/push.git-user-force' => 'dgit',
+	       'dgit-distro.debian/push.git-proto' => 'git+ssh://',
+	       'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
+	       'dgit-distro.debian/push.git-create' => 'true',
+	       'dgit-distro.debian/push.git-check' => 'ssh-cmd',
  'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
 # 'dgit-distro.debian.archive-query-tls-key',
 #    '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
@@ -460,13 +463,8 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 # 'dgit-distro.debian.archive-query-tls-curl-args',
 #   '--ca-path=/etc/ssl/ca-debian',
 # ^ this is a workaround but works (only) on DSA-administered machines
-	       'dgit-distro.debian.diverts.alioth' => '/alioth',
-	       'dgit-distro.debian/push.diverts.alioth' => '/alioth',
-	       'dgit-distro.debian/alioth.git-host' => 'git.debian.org',
-	       'dgit-distro.debian/alioth.git-user-force' => '',
-	       'dgit-distro.debian/alioth.git-proto' => 'git+ssh://',
-	       'dgit-distro.debian/alioth.git-path' => '/git/dgit-repos/repos',
-	       'dgit-distro.debian/alioth.git-create' => 'ssh-cmd',
+	       'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
+	       'dgit-distro.debian.git-url-suffix' => '',
 	       'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
 	       'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
  'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
@@ -647,7 +645,7 @@ sub access_giturl (;$) {
     my ($optional) = @_;
     my $url = access_cfg('git-url','RETURN-UNDEF');
     my $suffix;
-    if (!defined $url) {
+    if (!length $url) {
 	my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
 	return undef unless defined $proto;
 	$url =
@@ -1818,12 +1816,6 @@ sub dopush ($) {
 	    failedcmd @diffcmd;
 	}
     }
-#fetch from alioth
-#do fast forward check and maybe fake merge
-#    if (!is_fast_fwd(mainbranch
-#    runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
-#        map { lref($_).":".rref($_) }
-#        (uploadbranch());
     my $head = git_rev_parse('HEAD');
     if (!$changesfile) {
 	my $multi = "$buildproductsdir/".