From f0b1c57b5f6841834c085f618b2bf70e512ad914 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 22 Sep 2016 12:52:16 +0100
Subject: [PATCH] dgit: infopair tag fetch: Support multiple tags

No functional change with existing callers.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/dgit b/dgit
index cb6a1778..216a9c3e 100755
--- a/dgit
+++ b/dgit
@@ -2367,15 +2367,22 @@ END
 };
 
 sub infopair_lrf_tag_lookup ($$) {
-    my ($tagname, $what) = @_;
-    printdebug "infopair_lrfetchref_tag_lookup $what\n";
-    my $lrefname = lrfetchrefs."/tags/$tagname";
-    my $tagobj = $lrfetchrefs_f{$lrefname};
-    defined $tagobj or fail <<END;
-Wanted tag $tagname ($what) on dgit server, but not found
+    my ($tagnames, $what) = @_;
+    # $tagname may be an array ref
+    my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
+    printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
+    foreach my $tagname (@tagnames) {
+	my $lrefname = lrfetchrefs."/tags/$tagname";
+	my $tagobj = $lrfetchrefs_f{$lrefname};
+	next unless defined $tagobj;
+	printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
+	return [ git_rev_parse($tagobj), $what ];
+    }
+    fail @tagnames==1 ? <<END : <<END;
+Wanted tag $what (@tagnames) on dgit server, but not found
+END
+Wanted tag $what (one of: @tagnames) on dgit server, but not found
 END
-    printdebug "infopair_lrfetchref_tag_lookup $tagobj $what\n";
-    return [ git_rev_parse($tagobj), $what ];
 }
 
 sub infopair_cond_ff ($$) {
-- 
2.30.2