diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-18 00:28:09 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-18 01:38:06 +0100 |
commit | cb141c47ad54318dd4321e9f410aee5f8373c245 (patch) | |
tree | 963b58569e2dde1a047c7246428982b5501ad3a4 /dgit | |
parent | 1a18258bad3a6162491757dcbe1f4caeab9b56ab (diff) |
pseudomerge: In non-splitbrain, do not look at previous tags
We only want to know: is the current archive version what was
specified in --overwrite=VERSION, or mentioned in the changelog with
--overwrite (without VERSION). In that case we want to overwrite
whatever it is, even if the tags are missing or broken.
Prompted by #841101.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 10 |
1 files changed, 0 insertions, 10 deletions
@@ -2928,16 +2928,6 @@ sub plain_overwrite_pseudomerge ($$$) { my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash); - my @tagformats = access_cfg_tagformats(); - my @t_overwr = - 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"; - my $i_archive = [ $archive_hash, "current archive contents" ]; - - infopair_cond_equal($i_overwr, $i_archive); - return $head if is_fast_fwd $archive_hash, $head; my $m = "Declare fast forward from $i_arch_v->[0]"; |