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>

diff --git a/debian/changelog b/debian/changelog
index a288558e840dbf225da4dce8b56c8a6833770142..3418c7f7776bad9a98de01d1355b4f4b7bad5fa4 100644 (file)
--- 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 fa713fa5c5d8b4aff2070f132c5342ed9f5dab7c..e4eba536122933c2d6528d8803d2c1d6b46a1cc6 100755 (executable)
--- 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();
 }