summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-15 11:49:33 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-28 16:59:49 +0100
commit4fbbd8630238eb499848716c28a0e1c59886608b (patch)
tree372ed10d2e5b4c21e00066e4b579d1d6ff9006f6 /dgit
parent125e2aeb263d8db6efec22935bf1648715c690db (diff)
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>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit5
1 files changed, 3 insertions, 2 deletions
diff --git a/dgit b/dgit
index 51bd648..26a8bf0 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;
}