From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 28 Jun 2019 11:32:18 +0000 (+0100)
Subject: dgit: rpush: Work in splitting quilt modes, again
X-Git-Tag: archive/debian/9.0~144
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f52d69c4c3fd99b72b5402afb34fb1dbe5b64303;p=dgit.git

dgit: rpush: Work in splitting quilt modes, again

The failure case is missing the obviously-necessary check that the
protocol version is, indeed, insufficient!

This was broken in
  045ec681a42fd823280cdec86a177309ddd741f0
  Split tags: Genrate maintainer-view tag too
which was first uploaded as part of dgit 2.0.

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

diff --git a/dgit b/dgit
index 0cdcd34c..f1b322ad 100755
--- a/dgit
+++ b/dgit
@@ -5171,7 +5171,7 @@ sub i_resp_want ($) {
     fail f_ "rpush negotiated protocol version %s".
 	" which does not support quilt mode %s",
 	$protovsn, $quilt_mode
-	if quiltmode_splitbrain;
+	if quiltmode_splitbrain && $protovsn < 4;
 
     my @localpaths = i_method "i_want", $keyword;
     printdebug "[[  $keyword @localpaths\n";