Spelling fixes

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 99ed3e8c5766fa61608e2494489166c33798e548a870a08efd15d44ea79696cc..6f5ee84d0b820209a4788278f4fe559d1bbc6350eaca4a29a8822aeffa8ad610 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;
 }


@@ -3112,7 +3126,7 @@ sub git_get_projects_list {
        return @list;
 }
 
        return @list;
 }
 

-# written with help of Tree::Trie module (Perl Artistic License, GPL compatibile)
+# written with help of Tree::Trie module (Perl Artistic License, GPL compatible)

 # as side effects it sets 'forks' field to list of forks for forked projects
 sub filter_forks_from_projects_list {
        my $projects = shift;
 # as side effects it sets 'forks' field to list of forks for forked projects
 sub filter_forks_from_projects_list {
        my $projects = shift;


@@ -4363,7 +4377,7 @@ sub git_print_page_nav {
              "</div>\n";
 }
 
              "</div>\n";
 }
 

-# returns a submenu for the nagivation of the refs views (tags, heads,
+# returns a submenu for the navigation of the refs views (tags, heads,

 # remotes) with the current view disabled and the remotes view only
 # available if the feature is enabled
 sub format_ref_views {
 # remotes) with the current view disabled and the remotes view only
 # available if the feature is enabled
 sub format_ref_views {


@@ -8072,7 +8086,7 @@ sub git_search_help {
 <p><strong>Pattern</strong> is by default a normal string that is matched precisely (but without
 regard to case, except in the case of pickaxe). However, when you check the <em>re</em> checkbox,
 the pattern entered is recognized as the POSIX extended
 <p><strong>Pattern</strong> is by default a normal string that is matched precisely (but without
 regard to case, except in the case of pickaxe). However, when you check the <em>re</em> checkbox,
 the pattern entered is recognized as the POSIX extended

-<a href="http://en.wikipedia.org/wiki/Regular_expression">regular expression</a> (also case
+<a href="https://en.wikipedia.org/wiki/Regular_expression">regular expression</a> (also case

 insensitive).</p>
 <dl>
 <dt><b>commit</b></dt>
 insensitive).</p>
 <dl>
 <dt><b>commit</b></dt>