X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=373854eb9c33134da70d8ac30d4abcdd5c411928;hb=5c99625328b84337f2267c3ebdc54b4a93409198;hp=0dea96c8f1a678ad9c6d223197caa66e57cb2c0c;hpb=a840640baebaa11079b64be2ae5f89a111648985;p=dgit.git 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,