diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-07-30 18:30:48 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-07-30 18:30:48 +0100 |
commit | d16fb35f5d57b0337c2372de3a63430c17fb1226 (patch) | |
tree | 1200b6ad36c932f7fe74d523776ddb5d21f50ae5 | |
parent | 4383b44c16571b49dd741987a1dc49d145242039 (diff) |
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
-rw-r--r-- | debian/changelog | 3 | ||||
-rwxr-xr-x | dgit | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 37c8ea1..c10a713 100644 --- 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 @@ -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 |