diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-28 14:24:37 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-28 16:01:33 +0100 |
commit | eaf6e5c9151c7ee5c755da1df9acf27701c9cd67 (patch) | |
tree | bdfd6b169c1fa0a7b6a5d04a81b49f979c115311 | |
parent | 0d1f068aa2f32704bda24c57f13f3fec96859d84 (diff) |
dgit: Tidying up after tag format: Drop debiantag
Remove the now-superfluous level of indirection.
No functional change.
At some future point we may rename debiantag_new to debiantag
everywhere, but not right now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -214,11 +214,6 @@ if (!defined $absurdity) { $absurdity =~ s{/[^/]+$}{/absurd} or die; } -sub debiantag ($$) { - my ($v,$distro) = @_; - return debiantag_new($v, $distro); -} - sub madformat ($) { $_[0] eq '3.0 (quilt)' } sub lbranch () { return "$branchprefix/$csuite"; } @@ -4234,7 +4229,7 @@ sub push_parse_changelog ($) { if (!$we_are_initiator) { # rpush initiator can't do this because it doesn't have $isuite yet - my $tag = debiantag($cversion, access_nomdistro); + my $tag = debiantag_new($cversion, access_nomdistro); runcmd @git, qw(check-ref-format), $tag; } @@ -4258,7 +4253,7 @@ sub push_tagwants ($$$$) { my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_; my @tagwants; push @tagwants, { - TagFn => \&debiantag, + TagFn => \&debiantag_new, Objid => $dgithead, TfSuffix => '', View => 'dgit', |