From 418c2224e319a38ea2288d7ee5aacb4d04a390d7 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Oct 2016 20:06:28 +0000
Subject: [PATCH] Reject `dgit pull' in split view quilt modes

To avoid creating unfortunate wreckage on non-dgit-view
branches.  Closes:#842608.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog | 3 +++
 dgit             | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a288558e..3418c7f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ dgit (2.9~) unstable; urgency=low
     about possible skew).
   * dgit gbp-build will arrange to let gbp buildpackage generate
     .orig tarballs if it seems applicable.  Closes:#841094.
+  * Reject `dgit pull' in split view quilt modes, to avoid
+    creating unfortunate wreckage on non-dgit-view branches.
+    Closes:#842608.
 
  --
 
diff --git a/dgit b/dgit
index fa713fa5..e4eba536 100755
--- a/dgit
+++ b/dgit
@@ -3682,6 +3682,12 @@ sub cmd_fetch {
 sub cmd_pull {
     parseopts();
     fetchpullargs();
+    if (quiltmode_splitbrain()) {
+	my ($format, $fopts) = get_source_format();
+	madformat($format) and fail <<END
+dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
+END
+    }
     pull();
 }
 
-- 
2.30.2