From 359f4592c6035ee027cf283c6af7dcd435038776 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 28 Jun 2019 17:29:02 +0100 Subject: Dgit.pm: Move upstream_commitish_search from git-debrebase No functional change. Signed-off-by: Ian Jackson --- Debian/Dgit.pm | 13 ++++++++++++- git-debrebase | 11 ----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 455cb10..892ebf9 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -45,7 +45,7 @@ BEGIN { dep14_version_mangle debiantags debiantag_new debiantag_maintview - upstreamversion + upstreamversion upstream_commitish_search stripepoch source_file_leafname is_orig_file_of_p_v server_branch server_ref stat_exists link_ltarget rename_link_xf @@ -617,6 +617,17 @@ sub git_check_unmodified () { } } +sub upstream_commitish_search ($$) { + my ($upstream_version, $tried) = @_; + # todo: at some point maybe use git-deborig to do this + foreach my $tagpfx ('', 'v', 'upstream/') { + my $tag = $tagpfx.(dep14_version_mangle $upstream_version); + my $new_upstream = git_get_ref "refs/tags/$tag"; + push @$tried, $tag; + return $new_upstream if length $new_upstream; + } +} + sub is_fast_fwd ($$) { my ($ancestor,$child) = @_; my @cmd = (qw(git merge-base), $ancestor, $child); diff --git a/git-debrebase b/git-debrebase index 71bf39d..eb585e3 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1994,17 +1994,6 @@ sub do_stitch ($;$) { stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose); } -sub upstream_commitish_search ($$) { - my ($upstream_version, $tried) = @_; - # todo: at some point maybe use git-deborig to do this - foreach my $tagpfx ('', 'v', 'upstream/') { - my $tag = $tagpfx.(dep14_version_mangle $upstream_version); - my $new_upstream = git_get_ref "refs/tags/$tag"; - push @$tried, $tag; - return $new_upstream if length $new_upstream; - } -} - sub resolve_upstream_version ($$) { my ($new_upstream, $upstream_version) = @_; -- cgit v1.2.3