summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-28 15:13:52 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-28 16:59:49 +0100
commitc83c5cca4728c7c9a79e145a6fa4183dd73ad7c6 (patch)
tree73a13c64bdbf486740f1af2269f7ab0eb455f6ae /dgit
parent222378544900b50217a2f3cf80478639a074beee (diff)
dgit: Reject dgit pull in split brain mode
In splitting quilt modes dgit pull would have to back-convert the changes and currently there is no code to do this, and these cases were correctly rejected before. But in other quilt modes it would still have to strip off pseudomerges or quilt fixup commits. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit3
1 files changed, 2 insertions, 1 deletions
diff --git a/dgit b/dgit
index 5172c4d..36e0a2b 100755
--- a/dgit
+++ b/dgit
@@ -4835,7 +4835,8 @@ sub cmd_fetch {
sub cmd_pull {
parseopts();
fetchpullargs();
- if (quiltmode_splitbrain()) {
+ determine_whether_split_brain();
+ 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)