From 9d8d3f33124550239ceda34e6b6dbf14a4db77ec Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 18 Jun 2019 20:28:15 +0100 Subject: [PATCH] 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 --- dgit | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dgit b/dgit index 60d7f1fb..6a035d6a 100755 --- a/dgit +++ b/dgit @@ -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); -- 2.30.2