From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 17 Oct 2016 15:57:30 +0000 (+0100)
Subject: debian config; actually make split brain mode work.  Closes:#841085.
X-Git-Tag: debian/2.2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=8ff24012c9e4b826cedca7eada4476abf518ccd5

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 4a5aaff8..d8827a47 100644
--- 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 a568c579..60ab9a6c 100755
--- 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',