diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-26 01:34:16 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-26 01:36:40 +0100 |
commit | 22c277709304504b81ee28bd70a48a47b6b4c7e5 (patch) | |
tree | a79289653c517d180fe33d06d06caa0a7144d488 | |
parent | a539b3be49374fc958784cf77ac4be69c5fab546 (diff) |
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>
-rw-r--r-- | TODO.BRANCH | 7 | ||||
-rwxr-xr-x | dgit | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/TODO.BRANCH b/TODO.BRANCH index 141a3aa..f5261ed 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 @@ -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'); |