debian config; actually make split brain mode work. Closes:#841085.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 4a5aaff81b94a6b3d2c0f7785ffd256f8a9c1a51..d8827a47f3e480e0479de3543baaaec5419a36b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dgit (2.2) unstable; urgency=low
+
+  * Fix config relating to Debian to actually make split brain mode
+    work.  Closes:#841085.
+  * 
+
+ --
+
 dgit (2.1) unstable; urgency=low
 
   * Do not crash due in clone to failure to handle dpkg-parsechangelog

diff --git a/dgit b/dgit
index a568c579a00041813506a2425617304431126481..60ab9a6cc723e37c27742ab195dd104c2560d718 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -561,7 +561,6 @@ our %defcfg = ('dgit.default.distro' => 'debian',
               'dgit-distro.debian.git-check' => 'url',
               'dgit-distro.debian.git-check-suffix' => '/info/refs',
               'dgit-distro.debian.new-private-pushers' => 't',
-              'dgit-distro.debian.dgit-tag-format' => 'new',
               'dgit-distro.debian/push.git-url' => '',
               'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
               'dgit-distro.debian/push.git-user-force' => 'dgit',