From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Aug 2018 06:35:05 +0000 (+0100)
Subject: git-debrebase: resolve_upstream_version: Rename $upstream_version
X-Git-Tag: archive/debian/6.5~17
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=e8d0e4e6c4a5c34798d6be4e6b5be2349301d584

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 e75c90f6..a28b910b 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -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;