From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Sep 2016 23:24:23 +0000 (+0100)
Subject: Split brain: Always push the maintainer view tag
X-Git-Tag: archive/debian/2.0~153
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b8d6e4135d5268513b3b375614d7017e3b61cc87

Split brain: Always push the maintainer view tag

Our algorithm for calculating whether to do a pseudomerge to make the
dgit view fast forward from the archive contents depends on the
maintainer view tag (effectively, it uses it to go back from the
archive contents dgit view back to the corresponding maintainer view).

So we need to push it too.

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

diff --git a/dgit b/dgit
index 3905e576..bca6745c 100755
--- a/dgit
+++ b/dgit
@@ -2691,11 +2691,6 @@ END
 
     my @pushrefs = $forceflag.$dgithead.":".rrref();
     foreach my $tw (@tagwants) {
-	my $view = $tw->{View};
-	next unless $view eq 'dgit'
-	    or any { $_ eq $view } access_cfg_tagformats();
-	    # ^ $view is "dgit" or "maint" so this looks for "maint"
-	    # in archive supported tagformats.
 	push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
     }