diff options
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index e75c90f..a28b910 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; |