git-debrebase: resolve_upstream_version: Rename $upstream_version

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>

diff --git a/git-debrebase b/git-debrebase
index e75c90f61a66717f35dfde033e354451fad96000..a28b910bdcba08f2dd1c8f8b242917e27474ec8f 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1185,13 +1185,13 @@ sub do_stitch ($;$) {
 }
 
 sub resolve_upstream_version ($$) {
 }
 
 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/') {
 
     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;
            $new_upstream = git_get_ref "refs/tags/$tag";
            last if length $new_upstream;
            push @tried, $tag;