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

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 2c9c9f91cae77d5214dd0819cb83f8c10ce1a4a0..a53cb822950d9df861ab80df8d0996145d444b2d 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -19,7 +19,7 @@ BEGIN {
                       stat_exists fail waitstatusmsg failedcmd
                       cmdoutput cmdoutput_errok
                       git_rev_parse git_for_each_ref
-                      git_for_each_tag_referring
+                      git_for_each_tag_referring is_fast_fwd
                       $package_re $component_re $deliberately_re
                       $branchprefix
                       initdebug enabledebug enabledebuglevel
@@ -200,15 +200,31 @@ 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);
     });
 }
 
+sub is_fast_fwd ($$) {
+    my ($ancestor,$child) = @_;
+    my @cmd = (qw(git merge-base), $ancestor, $child);
+    my $mb = cmdoutput_errok @cmd;
+    if (defined $mb) {
+       return git_rev_parse($mb) eq git_rev_parse($ancestor);
+    } else {
+       $?==256 or failedcmd @cmd;
+       return 0;
+    }
+}
+
 1;