gitweb: link to "git describe"'d commits in log messages

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 99ed3e8c5766fa61608e2494489166c33798e548a870a08efd15d44ea79696cc..1e0af11a04eb4c3a0ebe2b0d12f080659ba9d43404dc21d4182caa9bca8bf162 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -2037,10 +2037,24 @@ sub format_log_line_html {
        my $line = shift;
 
        $line = esc_html($line, -nbsp=>1);
        my $line = shift;
 
        $line = esc_html($line, -nbsp=>1);

-       $line =~ s{\b([0-9a-fA-F]{7,40})\b}{
+       $line =~ s{
+        \b
+        (
+            # The output of "git describe", e.g. v2.10.0-297-gf6727b0
+            # or hadoop-20160921-113441-20-g094fb7d
+            (?<!-) # see strbuf_check_tag_ref(). Tags can't start with -
+            [A-Za-z0-9.-]+
+            (?!\.) # refs can't end with ".", see check_refname_format()
+            -g[0-9a-fA-F]{7,40}
+            |
+            # Just a normal looking Git SHA1
+            [0-9a-fA-F]{7,40}
+        )
+        \b
+    }{

                $cgi->a({-href => href(action=>"object", hash=>$1),
                                        -class => "text"}, $1);
                $cgi->a({-href => href(action=>"object", hash=>$1),
                                        -class => "text"}, $1);

-       }eg;
+       }egx;

 
        return $line;
 }
 
        return $line;
 }