summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-30 20:06:28 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-30 22:46:35 +0000
commit418c2224e319a38ea2288d7ee5aacb4d04a390d7 (patch)
treeaf8b6e7a026b1d4a8596baff4acddf9adcd44b8d /dgit
parent2000017de47d25a6ac921e62e5d884cf204b9d4f (diff)
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>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit6
1 files changed, 6 insertions, 0 deletions
diff --git a/dgit b/dgit
index fa713fa..e4eba53 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();
}