From 5c99625328b84337f2267c3ebdc54b4a93409198 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 26 Sep 2016 00:46:22 +0100 Subject: [PATCH] Overwrite: Refer to $i_arch_v->[0] twice in plain_overwrite_pseudomerge We are going to allow $overwrite_version to be "", in which case we will have to use $i_arch_v->[0] instead. Right now both are the same because if $overwrite_version is defined (as it must be in plain_overwrite_pseudomerge), pseudomerge_version_check will call infopair_cond_equal - so, no functional change right now. Signed-off-by: Ian Jackson --- dgit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dgit b/dgit index 0dea96c8..373854eb 100755 --- a/dgit +++ b/dgit @@ -2506,7 +2506,7 @@ sub plain_overwrite_pseudomerge ($$$) { my @tagformats = access_cfg_tagformats(); my @t_overwr = - map { $_->($overwrite_version, access_basedistro) } + map { $_->($i_arch_v->[0], access_basedistro) } (grep { m/^(?:old|hist)$/ } @tagformats) ? \&debiantags : \&debiantag_new; my $i_overwr = infopair_lrf_tag_lookup \@t_overwr, "previous version tag"; @@ -2516,7 +2516,7 @@ sub plain_overwrite_pseudomerge ($$$) { return $head if is_fast_fwd $archive_hash, $head; - my $m = "Declare fast forward from $overwrite_version"; + my $m = "Declare fast forward from $i_arch_v->[0]"; my $r = pseudomerge_make_commit $clogp, $head, $archive_hash, $i_arch_v, -- 2.30.2