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 99bd51a5e73bda417b13066158d838e85fbe291d..97557ce1c3e1c3a4042160a8c2ab99359184330b 100755 (executable)
--- 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) = @_;