summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-18 16:02:28 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-19 19:36:15 +0100
commit0e6a55238ffdee98d5b23c70fe4105c41ea28f34 (patch)
treec6a28ea44556b9238f5a6baf94e5dafce06d9437
parent196d61f51d2191bf44d5bfe0ccb4456a59f0446a (diff)
Switch to new production git repositories for reading. (this can no longer divert to alioth).
-rw-r--r--debian/changelog2
-rwxr-xr-xdgit17
2 files changed, 13 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 6081671..36357c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dgit (0.31~~) unstable; urgency=low
Improvements:
* Memoise git config lookups (big speedup!)
+ * Switch to new production git repositories for reading.
+ (this can no longer divert to alioth).
Documentation:
* dgit(1): Remove some obsolete caveats from BUGS.
diff --git a/dgit b/dgit
index 70ff8c4..ac394f0 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' => 'dgit-git.debian.net',
+ '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',
@@ -461,6 +464,8 @@ our %defcfg = ('dgit.default.distro' => 'debian',
# '--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.git-url' => 'https://git.dgit.debian.org',
+ 'dgit-distro.debian.git-url-suffix' => '',
'dgit-distro.debian/push.diverts.alioth' => '/alioth',
'dgit-distro.debian/alioth.git-host' => 'git.debian.org',
'dgit-distro.debian/alioth.git-user-force' => '',