Revert "Switch to using dgit@git.debian.org (and dgit-repos-server) by default."

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

diff --git a/debian/changelog b/debian/changelog
index 37c8ea1e2a8755f186d75f6dc1429d3c95867b25..c10a7137fcf1b2663e7cc28347a97ece4c5cebc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 2d2c0f19fe7dc60ca90c0c50f6b8d55f77d38cb1..6369856c4d77d498814e4a0237b6738d1795903c 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