diff options
Diffstat (limited to 'Debian')
| -rw-r--r-- | Debian/Dgit.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 4e19657..4059e2b 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -639,9 +639,10 @@ sub upstream_commitish_search ($$) { my $tag = $tagpfx.(dep14_version_mangle $upstream_version); my $new_upstream = git_get_ref "refs/tags/$tag"; push @$tried, $tag; - push @found, $tag if $new_upstream; + push @found, [ $tag, $new_upstream ] if $new_upstream; } - return $found[0] if @found == 1; + return @{ $found[0] } if @found == 1; + return (); } sub resolve_upstream_version ($$) { @@ -651,7 +652,8 @@ sub resolve_upstream_version ($$) { my $message = __ 'using specified upstream commitish'; if (!defined $new_upstream) { my @tried; - $new_upstream = upstream_commitish_search $upstream_version, \@tried; + ($used, $new_upstream) = + upstream_commitish_search $upstream_version, \@tried; if (!length $new_upstream) { fail f_ "Could not determine appropriate upstream commitish.\n". @@ -659,7 +661,6 @@ sub resolve_upstream_version ($$) { " Check version, and specify upstream commitish explicitly.", "@tried"; } - $used = $tried[-1]; $message = f_ 'using upstream from git tag %s', $used; } elsif ($new_upstream =~ m{^refs/tags/($versiontag_re)$}s) { $message = f_ 'using upstream from git tag %s', $1; |