summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-18 20:06:40 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-28 12:45:38 +0100
commit828e8d1b2a321aaa34da7e7cb5963b18dc2c3b7a (patch)
tree4271ba27380552b8c1f785c0af7d883ec35fe254
parentb0e869bfd2247ab7465547d1363254f3d97f6504 (diff)
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>
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
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 "$!";