chiark / gitweb /
Revert "Switch to using dgit@git.debian.org (and dgit-repos-server) by default."
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 30 Jul 2014 17:30:48 +0000 (18:30 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 30 Jul 2014 17:30:48 +0000 (18:30 +0100)
The infrastructure end of this is not ready.  But I want to push this
branch to master so I don't end up with irreconcileable branches.  So
revert the change to the default config.

This reverts commit 111b247b6198535db5788a07069971e409f539cd.

Conflicts:
debian/changelog

debian/changelog
dgit

index 37c8ea1..c10a713 100644 (file)
@@ -9,9 +9,6 @@ dgit (0.22~experimental1) experimental; urgency=low
   * dgit-repos-server: WIP
   * New script tests/using-intree for running tests on the source tree.
 
-  * Switch to using dgit@git.debian.org (and dgit-repos-server) by
-    default.
-
  --
 
 dgit (0.21) unstable; urgency=medium
diff --git a/dgit b/dgit
index 2d2c0f1..6369856 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -450,12 +450,11 @@ our %defcfg = ('dgit.default.distro' => 'debian',
               'dgit.default.username' => '',
               'dgit.default.archive-query-default-component' => 'main',
               'dgit.default.ssh' => 'ssh',
-              'dgit-distro.debian.git-user' => 'dgit',
               'dgit-distro.debian.git-host' => 'git.debian.org',
               'dgit-distro.debian.git-proto' => 'git+ssh://',
-              'dgit-distro.debian.git-path' => '/dgit-repos/',
-              'dgit-distro.debian.git-check' => 'true',
-              'dgit-distro.debian.git-create' => 'true',
+              'dgit-distro.debian.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' => 'coccia.debian.org',
               'dgit-distro.debian.sshpsql-dbname' => 'service=projectb',
               'dgit-distro.debian.upload-host' => 'ftp-master', # for dput