From 22c277709304504b81ee28bd70a48a47b6b4c7e5 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 26 Sep 2016 01:34:16 +0100
Subject: [PATCH] Split brain: Check that archive supports "maint", earlier

Otherwise the user will be disappointed shortly.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 TODO.BRANCH |  7 -------
 dgit        | 10 ++++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 141a3aab..f5261ed9 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,11 +1,4 @@
 
-SPLIT BRAIN
-
-  * Check archive allegedly supports split brain mode before running
-    off into the weeds and crashing out in the push.
-
-
-
 OTHER
 
  * Better import format for complex .dscs
diff --git a/dgit b/dgit
index 5a373630..0cf854d3 100755
--- a/dgit
+++ b/dgit
@@ -3696,6 +3696,16 @@ sub build_maybe_quilt_fixup () {
 
     check_for_vendor_patches();
 
+    if (quiltmode_splitbrain) {
+	foreach my $needtf (qw(new maint)) {
+	    next if grep { $_ eq $needtf } access_cfg_tagformats;
+	    fail <<END
+quilt mode $quilt_mode requires split view so server needs to support
+ both "new" and "maint" tag formats, but config says it doesn't.
+END
+	}
+    }
+
     my $clogp = parsechangelog();
     my $headref = git_rev_parse('HEAD');
 
-- 
2.30.2