diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-01 01:13:57 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-01 03:34:13 +0100 |
commit | 6f15f6d53ce1b671a23aea940ca4a0213f6aa6f4 (patch) | |
tree | b6a367c9cca1a73ed2c097cf7b5146290f9b0845 /dgit | |
parent | 66b8676ac88921bcf2c97abd4e5ae4dea87e4360 (diff) |
dgit: splitbrain_pseudomerge: Introduce $arch_v (nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 ? <<END_OVERWR : <<END_MAKEFF); -Declare fast forward from $i_arch_v->[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; } |