Dgit.pm: git_for_each_tag_referring provides referred-to object id too

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index f20f1bc44c719d918ea0cb8cf689b13cdaeb4223..a53cb822950d9df861ab80df8d0996145d444b2d 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -200,14 +200,18 @@ sub git_for_each_ref ($$) {
 
 sub git_for_each_tag_referring ($$) {
     my ($objreferring, $func) = @_;
-    # calls $func->($objid,$fullrefname,$tagname);
+    # calls $func->($tagobjid,$refobjid,$fullrefname,$tagname);
     printdebug "git_for_each_tag_referring ",
         ($objreferring // 'UNDEF'),"\n";
     git_for_each_ref('refs/tags', sub {
-       my ($objid,$objtype,$fullrefname,$tagname) = @_;
+       my ($tagobjid,$objtype,$fullrefname,$tagname) = @_;
        return unless $objtype eq 'tag';
-       return if defined $objreferring and $objid ne $objreferring;
-       $func->($objid,$fullrefname,$tagname);
+       my $refobjid = git_rev_parse $tagobjid;
+       return unless
+           !defined $objreferring # caller wants them all
+           or $tagobjid eq $objreferring
+           or $refobjid eq $objreferring;
+       $func->($tagobjid,$refobjid,$fullrefname,$tagname);
     });
 }
 

diff --git a/dgit b/dgit
index 9b401a2291eb55c642a3effaf90058a62aff9339..1e348f366858c775bb9a31bffb567fc513f03806 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1667,7 +1667,7 @@ sub dopush ($) {
 
     if ($forceflag && defined $lastpush_hash) {
        git_for_each_tag_referring($lastpush_hash, sub {
-           my ($objid,$fullrefname,$tagname) = @_;
+           my ($objid,$refobjid,$fullrefname,$tagname) = @_;
            responder_send_command("supersedes $fullrefname=$objid");
            $supersedes{$fullrefname} = $objid;
        });

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 26164067dbc47b77389b0ded4b61980761226418..f700df81ca1f507e711afff2bceea5097919f0ee 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -680,7 +680,7 @@ sub checktagnoreplay () {
     my @problems;
 
     git_for_each_tag_referring($onlyreferring, sub {
-       my ($objid,$fullrefname,$tagname) = @_;
+       my ($objid,$refobjid,$fullrefname,$tagname) = @_;
        printdebug "checktagnoreplay - overwriting $fullrefname=$objid\n";
        my $supers = $supersedes{$fullrefname};
        if (!defined $supers) {