From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 22 Jun 2020 15:05:37 +0000 (+0100)
Subject: git-debrebase: Rename a variable $ups_tag to $ups_rev
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=357fe8157dd06aad0e998a37f6cdb3c582ee5be0;p=dgit.git

git-debrebase: Rename a variable $ups_tag to $ups_rev

This is a commit, not a tag.  This is prepping for a change where
the tag will be here in a variable too.

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

diff --git a/git-debrebase b/git-debrebase
index 06f56d87..171249f7 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2697,10 +2697,10 @@ END
     if (!@upstreams) {
 	if ($do_tags) {
 	    my @tried;
-	    my $ups_tag = upstream_commitish_search $version, \@tried;
-	    if ($ups_tag) {
+	    my $ups_rev = upstream_commitish_search $version, \@tried;
+	    if ($ups_rev) {
 		my $this = f_ "git tag %s", $tried[-1];
-		push @upstreams, { Commit => $ups_tag,
+		push @upstreams, { Commit => $ups_rev,
 				   Source => $this,
 				 };
 	    } else {