From 828e8d1b2a321aaa34da7e7cb5963b18dc2c3b7a Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Jun 2019 20:06:40 +0100
Subject: dgit: quiltify: Go back to dgit-view if appropriate

Going back to master is fine with a unified view, but we are going to
want to cope with a split view here.

No functional change since $do_split_brain is not ever set here, yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index dd052fe..d720f5a 100755
--- a/dgit
+++ b/dgit
@@ -6301,7 +6301,7 @@ END
 
     progress f_ "starting quiltify (multiple patches, %s mode)", $quilt_mode;
     quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
-    runcmd @git, qw(checkout -q master);
+    runcmd @git, qw(checkout -q), (qw(master dgit-view)[!!$do_split_brain]);
 
     if (!open P, '>>', ".pc/applied-patches") {
 	$!==&ENOENT or confess "$!";
-- 
cgit v1.2.3