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

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 01429fb4b4dc9cc63cd5b1575e0ff2e94549b674..171249f771e1716a9eb0b39675c460780597291e 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -3,7 +3,8 @@
 # Script helping make fast-forwarding histories while still rebasing
 # upstream deltas when working on Debian packaging
 #
-# Copyright (C)2017,2018 Ian Jackson
+# Copyright (C)2017-2019 Ian Jackson
+# Copyright (C)2019      Niko Tyni
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -120,7 +121,6 @@ our $playprefix = 'debrebase';
 our $rd;
 our $workarea;
 
-our @git = qw(git);
 our @dgit = qw(dgit);
 
 sub in_workarea ($) {
@@ -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 {