From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 Jun 2019 10:49:33 +0000 (+0100)
Subject: dgit: Reject split view with correct message
X-Git-Tag: archive/debian/9.0~88
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4fbbd8630238eb499848716c28a0e1c59886608b

dgit: Reject split view with correct message

Now, it is not just a splitting quilt mode which might cause this, but
also an explicit request for split view.

This has some duplicated text, which I understand is easier for
translators.

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

diff --git a/dgit b/dgit
index 51bd6482..26a8bf0c 100755
--- a/dgit
+++ b/dgit
@@ -4854,7 +4854,7 @@ sub cmd_pull {
     if (do_split_brain()) {
 	my ($format, $fopts) = get_source_format();
 	madformat($format) and fail f_ <<END, $quilt_mode
-dgit pull not yet supported in split view mode (--quilt=%s)
+dgit pull not yet supported in split view mode (including with view-splitting quilt modes)
 END
     }
     pull();
@@ -6388,7 +6388,8 @@ sub build_or_push_prep_early () {
 sub build_or_push_prep_modes () {
     determine_whether_split_brain();
 
-    fail __ "dgit: --include-dirty is not supported in split view quilt mode"
+    fail __ "dgit: --include-dirty is not supported with split view".
+            " (including with view-splitting quilt modes)"
 	if do_split_brain() && $includedirty;
 }