X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=4e1965702c1d8c980d9ecad86f40c415873fee4f;hb=0bb8e2a87e3c8b5be0fce5c2491b292e9273056e;hp=5d898ae5f6ab1c33e1f2f043d5c684bd1fe5005b;hpb=f72c5db7d8b587facc24999af1d2fd03f2026d1a;p=dgit.git

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 5d898ae5..4e196570 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -634,12 +634,14 @@ sub git_check_unmodified () {
 sub upstream_commitish_search ($$) {
     my ($upstream_version, $tried) = @_;
     # todo: at some point maybe use git-deborig to do this
+    my @found;
     foreach my $tagpfx ('', 'v', 'upstream/') {
 	my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
 	my $new_upstream = git_get_ref "refs/tags/$tag";
 	push @$tried, $tag;
-	return $new_upstream if length $new_upstream;
+	push @found, $tag if $new_upstream;
     }
+    return $found[0] if @found == 1;
 }
 
 sub resolve_upstream_version ($$) {