[PATCH] Use describe to come up with the closest tag.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
* This gives saner output than what is currently there. It
does not have direct relation to the diff-tree --cc patch,
but over there I already use describe so this patch is to
make things consistent.
gitweb.cgi | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
3fb28888448edc8b2d4aeab55bc13d78746e5a45
diff --git a/gitweb.cgi b/gitweb.cgi
index c1bb624..3c43695 100755
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -2051,20 +2051,11 @@ sub git_commitdiff_plain {
close $fd or die_error(undef, "Reading diff-tree failed.");
# try to figure out the next tag after this commit
- my $tagname;
my $refs = read_info_ref("tags");
- open $fd, "-|", "$gitbin/git-rev-list HEAD";
- chomp (my (@commits) = <$fd>);
+ open $fd, "-|", "$gitbin/git-describe $hash";
+ my ($tagname) = <$fd>;
+ chomp($tagname);
close $fd;
- foreach my $commit (@commits) {
- if (defined $refs->{$commit}) {
- $tagname = $refs->{$commit}
- }
- if ($commit eq $hash) {
- last;
- }
- }
-
print $cgi->header(-type => "text/plain", -charset => 'utf-8', '-content-disposition' => "inline; filename=\"git-$hash.patch\"");
my %co = git_read_commit($hash);
my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
--
1.1.6.gbb042
Junio C Hamano <junkio@cox.net>