diff options
| -rwxr-xr-x | dgit | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -5400,10 +5400,7 @@ sub quiltify_splitbrain ($$$$$$$) { local $ENV{GIT_AUTHOR_EMAIL} = $authline[1]; local $ENV{GIT_AUTHOR_DATE} = $authline[2]; - die if $split_brain; die unless $do_split_brain; - runcmd @git, qw(checkout -q -b dgit-view); - $split_brain = 1; my $fulldiffhint = sub { my ($x,$y) = @_; @@ -6225,6 +6222,11 @@ END push @failsuggestion, [ 'origs', __ "Maybe orig tarball(s) are not identical to git representation?" ]; + if ($do_split_brain) { + runcmd @git, qw(checkout -q -b dgit-view); + die if $split_brain; + $split_brain = 1; + } if (quiltmode_splitbrain()) { quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree, $diffbits, \%editedignores, |