infra/dgit-ssh-dispatch: New production infra script

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 38b02e4e1b4ca07f8163b9e0ad440a2df0d1b24b..6d346207444184adb992f57b10445a986449fddb 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -520,9 +520,15 @@ our %defcfg = ('dgit.default.distro' => 'debian',
               'dgit.default.archive-query' => 'madison:',
               'dgit.default.sshpsql-dbname' => 'service=projectb',
               'dgit-distro.debian.archive-query' => 'sshpsql:',
-              'dgit-distro.debian.git-host' => 'git.debian.org',
+              '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' => '/git/dgit-repos/repos',
+              'dgit-distro.debian.git-path' => '/dgit/debian/repos',
+              'dgit-distro.debian.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.git-check' => 'ssh-cmd',
               'dgit-distro.debian.git-create' => 'ssh-cmd',
               'dgit-distro.debian.sshpsql-host' => 'mirror.ftp-master.debian.org',
@@ -1377,6 +1383,7 @@ sub clone ($) {
     my ($dstdir) = @_;
     canonicalise_suite();
     badusage "dry run makes no sense with clone" unless act_local();
+    my $hasgit = check_for_git();
     mkdir $dstdir or die "$dstdir $!";
     changedir $dstdir;
     runcmd @git, qw(init -q);
@@ -1388,7 +1395,7 @@ sub clone ($) {
        close H or die $!;
        runcmd @git, qw(remote add), 'origin', $giturl;
     }
-    if (check_for_git()) {
+    if ($hasgit) {
        progress "fetching existing git history";
        git_fetch_us();
        runcmd_ordryrun_local @git, qw(fetch origin);