diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-18 20:28:15 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-28 12:45:38 +0100 |
commit | 9d8d3f33124550239ceda34e6b6dbf14a4db77ec (patch) | |
tree | d28ee3593ed3d6fffde07359183ce22bf8d5019f /dgit | |
parent | 42a859777ce9d299137917c7d8f1cff7c074fa71 (diff) |
dgit: Do split brain cache and saving in build_maybe_quilt_fixup
This wants to happy whenever we have a split brain, not only in
splitting multipatch modes.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -5525,16 +5525,6 @@ END [dgit ($our_version) update-gitignore-quilt-fixup] ENDU } - - my $dgitview = git_rev_parse 'HEAD'; - - changedir $maindir; - reflog_cache_insert "refs/$splitbraincache", $cachekey, $dgitview; - - changedir "$playground/work"; - - my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted"; - progress f_ "dgit view: created (%s)", $saved; } sub quiltify ($$$$) { @@ -5867,6 +5857,19 @@ sub build_maybe_quilt_fixup () { $splitbrain_cachekey); } + if ($do_split_brain) { + my $dgitview = git_rev_parse 'HEAD'; + + changedir $maindir; + reflog_cache_insert "refs/$splitbraincache", + $splitbrain_cachekey, $dgitview; + + changedir "$playground/work"; + + my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted"; + progress f_ "dgit view: created (%s)", $saved; + } + changedir $maindir; runcmd_ordryrun_local @git, qw(pull --ff-only -q), "$playground/work", qw(master); |