From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 18 Jul 2015 15:02:28 +0000 (+0100)
Subject: Switch to new production git repositories for reading. (this can no longer divert... 
X-Git-Tag: debian/1.0~16
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0e6a55238ffdee98d5b23c70fe4105c41ea28f34;hp=196d61f51d2191bf44d5bfe0ccb4456a59f0446a;ds=sidebyside

Switch to new production git repositories for reading. (this can no longer divert to alioth).
---

diff --git a/debian/changelog b/debian/changelog
index 6081671f..36357c42 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 70ff8c4b..ac394f06 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' => '',