From 6f15f6d53ce1b671a23aea940ca4a0213f6aa6f4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 1 Oct 2018 01:13:57 +0100 Subject: [PATCH] dgit: splitbrain_pseudomerge: Introduce $arch_v (nfc Signed-off-by: Ian Jackson --- dgit | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dgit b/dgit index a253b2d4..9fd01b0d 100755 --- a/dgit +++ b/dgit @@ -4096,18 +4096,19 @@ END finish -1; } + my $arch_v = $i_arch_v->[0]; my $r = pseudomerge_make_commit $clogp, $dgitview, $archive_hash, $i_arch_v, "dgit --quilt=$quilt_mode", (defined $overwrite_version ? <[0] +Declare fast forward from $arch_v END_OVERWR -Make fast forward from $i_arch_v->[0] +Make fast forward from $arch_v END_MAKEFF maybe_split_brain_save $maintview, $r, "pseudomerge"; - progress "Made pseudo-merge of $i_arch_v->[0] into dgit view."; + progress "Made pseudo-merge of $arch_v into dgit view."; return $r; } -- 2.30.2