chiark / gitweb /
git-debrebase: resolve_upstream_version: Rename $upstream_version
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Aug 2018 06:35:05 +0000 (07:35 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 4 Aug 2018 06:35:05 +0000 (07:35 +0100)
This used to be called $new_upstream_version but this function is
called in other contexts too.

NFC.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index e75c90f..a28b910 100755 (executable)
@@ -1185,13 +1185,13 @@ sub do_stitch ($;$) {
 }
 
 sub resolve_upstream_version ($$) {
-    my ($new_upstream, $new_upstream_version) = @_;
+    my ($new_upstream, $upstream_version) = @_;
 
     if (!defined $new_upstream) {
        my @tried;
        # todo: at some point maybe use git-deborig to do this
        foreach my $tagpfx ('', 'v', 'upstream/') {
-           my $tag = $tagpfx.(dep14_version_mangle $new_upstream_version);
+           my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
            $new_upstream = git_get_ref "refs/tags/$tag";
            last if length $new_upstream;
            push @tried, $tag;