summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-17 16:57:30 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-17 16:57:35 +0100
commit8ff24012c9e4b826cedca7eada4476abf518ccd5 (patch)
tree529bb434274f7d37010eb80a77bb583c97409259
parentf260757c3cd326d1a424f862c0e97a1940dea2aa (diff)
debian config; actually make split brain mode work. Closes:#841085.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog8
-rwxr-xr-xdgit1
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 4a5aaff..d8827a4 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 a568c57..60ab9a6 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',