From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 22 Sep 2016 11:35:32 +0000 (+0100)
Subject: Split brain: Only send rpush maint-view param if $maintviewhead
X-Git-Tag: archive/debian/2.0~127
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=55f12281eebd4352753e45a31ee4e69bfbc5c48e

Split brain: Only send rpush maint-view param if $maintviewhead

Fixes a bug where rpush would always make two tags even for a
non-`3.0 (quilt)' package.

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

diff --git a/dgit b/dgit
index 77eae6b0..57c0e5c9 100755
--- a/dgit
+++ b/dgit
@@ -2749,7 +2749,7 @@ END
     responder_send_command("param head $dgithead");
     responder_send_command("param csuite $csuite");
     responder_send_command("param tagformat $tagformat");
-    if (quiltmode_splitbrain) {
+    if (defined $maintviewhead) {
 	die unless ($protovsn//4) >= 4;
 	responder_send_command("param maint-view $maintviewhead");
     }