diff options
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -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) = @_; |