gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header

Use git_get_rev_name_tags function for X-Git-Tag: header in
git_commitdiff('plain'), i.e. for commitdiff_plain action.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 7aa6838836c61a7c965cff42630f98d8407fceac..50e405f6fef49a8c099d44f8f3fce7b1d6f1bbca 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2840,10 +2840,7 @@ sub git_commitdiff {
 
        } elsif ($format eq 'plain') {
                my $refs = git_get_references("tags");
 
        } elsif ($format eq 'plain') {
                my $refs = git_get_references("tags");

-               my @tagnames;
-               if (exists $refs->{$hash}) {
-                       @tagnames = map { s|^tags/|| } $refs->{$hash};
-               }
+               my $tagname = git_get_rev_name_tags($hash);

                my $filename = basename($project) . "-$hash.patch";
 
                print $cgi->header(
                my $filename = basename($project) . "-$hash.patch";
 
                print $cgi->header(


@@ -2857,10 +2854,9 @@ sub git_commitdiff {
 Date: $ad{'rfc2822'} ($ad{'tz_local'})
 Subject: $co{'title'}
 TEXT
 Date: $ad{'rfc2822'} ($ad{'tz_local'})
 Subject: $co{'title'}
 TEXT

-               foreach my $tag (@tagnames) {
-                       print "X-Git-Tag: $tag\n";
-               }
+               print "X-Git-Tag: $tagname\n" if $tagname;

                print "X-Git-Url: " . $cgi->self_url() . "\n\n";
                print "X-Git-Url: " . $cgi->self_url() . "\n\n";

+

                foreach my $line (@{$co{'comment'}}) {
                        print "$line\n";
                }
                foreach my $line (@{$co{'comment'}}) {
                        print "$line\n";
                }