diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-05-20 23:52:00 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-28 12:45:38 +0100 |
commit | 2ed788312403c831c0b7fdffcfce708434cfe472 (patch) | |
tree | 3583396ae262ed7a27a2edfafc1b06e65824ea87 /dgit | |
parent | d01fd9703f518305690d7fe79883a1365b343feb (diff) |
dgit: quilt fixup: Move split brain branch creation out a bit
Move the playtree git branch, and the setting $split_brain from
quiltify_splitbrain (inside quilt_fixup_multipatch, conditional on
quiltmode_splitbrain) to quilt_fixup_multipatch.
This is still not quite right - it needs to be further out, because it
should affect quilt_fixup_singlepatch too. Right now singlepatch DTWT
in split brain mode.
No functional change for now, anyway.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-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, |