From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 20 May 2019 20:55:06 +0000 (+0100)
Subject: dgit: Move quiltify_splitbrain_needed into its one call site
X-Git-Tag: archive/debian/9.0~140
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9dd8836fb53b8d37db646b28d6ae94b052130736;p=dgit.git

dgit: Move quiltify_splitbrain_needed into its one call site

I think $split_brain is always 0 on entry.  It is this
quiltify_splitbrain which used to calculate whether actually splitting
brain was needed based on the quilt mode and the state of the tree.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 99bd51a5..97557ce1 100755
--- a/dgit
+++ b/dgit
@@ -5374,13 +5374,6 @@ sub quiltify_tree_sentinelfiles ($) {
     return $r;
 }
 
-sub quiltify_splitbrain_needed () {
-    if (!$split_brain) {
-	runcmd @git, qw(checkout -q -b dgit-view);
-	$split_brain = 1;
-    }
-}
-
 sub quiltify_splitbrain ($$$$$$$) {
     my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
 	$editedignores, $cachekey) = @_;
@@ -5400,7 +5393,9 @@ sub quiltify_splitbrain ($$$$$$$) {
     local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
     local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
 
-    quiltify_splitbrain_needed();
+    die if $split_brain;
+    runcmd @git, qw(checkout -q -b dgit-view);
+    $split_brain = 1;
 
     my $fulldiffhint = sub {
 	my ($x,$y) = @_;