chiark / gitweb /
dgit: quiltify: Go back to dgit-view if appropriate
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 18 Jun 2019 19:06:40 +0000 (20:06 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 11:45:38 +0000 (12:45 +0100)
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

diff --git a/dgit b/dgit
index dd052fe106d95d2fd159f739b2ea14274988f67f..d720f5aff013047d3b271c444ed7d84aedb510ae 100755 (executable)
--- 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 "$!";