gitweb: remove title shortening heuristics

[Gitweb] / gitweb.perl
diff --git a/gitweb.perl b/gitweb.perl

index 2ff0d7a554a381bbe9821a20f33d092f65a48a97677cfd35d55c84befa7537c0..8c96a1dd0ab78384a91c40b8cde1a09478a2b6fd58f6127f3bd05e3657c4b807 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -3561,23 +3561,6 @@ sub parse_commit_text {
                 $title =~ s/^    //;
                 if ($title ne "") {
                         $co{'title'} = chop_str($title, 80, 5);
-                       # remove leading stuff of merges to make the interesting part visible
-                       if (length($title) > 50) {
-                               $title =~ s/^Automatic //;
-                               $title =~ s/^merge (of|with) /Merge ... /i;
-                               if (length($title) > 50) {
-                                       $title =~ s/(http|rsync):\/\///;
-                               }
-                               if (length($title) > 50) {
-                                       $title =~ s/(master|www|rsync)\.//;
-                               }
-                               if (length($title) > 50) {
-                                       $title =~ s/kernel.org:?//;
-                               }
-                               if (length($title) > 50) {
-                                       $title =~ s/\/pub\/scm//;
-                               }
-                       }
                         $co{'title_short'} = chop_str($title, 50, 5);
                         last;
                 }
@@ -3797,7 +3780,8 @@ sub git_get_heads_list {
         my @headslist;
  
         open my $fd, '-|', git_cmd(), 'for-each-ref',
-               ($limit ? '--count='.($limit+1) : ()), '--sort=-committerdate',
+               ($limit ? '--count='.($limit+1) : ()),
+               '--sort=-HEAD', '--sort=-committerdate',
                 '--format=%(objectname) %(refname) %(subject)%00%(committer)',
                 @patterns
                 or return;
@@ -4213,19 +4197,20 @@ sub git_header_html {
         my %opts = @_;
  
         my $title = get_page_title();
-       my $content_type = get_content_type_html();
-       print $cgi->header(-type=>$content_type, -charset => 'utf-8',
+       print $cgi->header(-type=>get_content_type_html(), -charset => 'utf-8',
                            -status=> $status, -expires => $expires)
                 unless ($opts{'-no_http_header'});
         my $mod_perl_version = $ENV{'MOD_PERL'} ? " $ENV{'MOD_PERL'}" : '';
         print <<EOF;
  <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html [
+       <!ENTITY nbsp "&#xA0;">
+       <!ENTITY sdot "&#x22C5;">
+]>
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
  <!-- git web interface version $version, (C) 2005-2006, Kay Sievers <kay.sievers\@vrfy.org>, Christian Gierke -->
  <!-- git core binaries version $git_version -->
  <head>
-<meta http-equiv="content-type" content="$content_type; charset=utf-8"/>
  <meta name="generator" content="gitweb/$version git/$git_version$mod_perl_version"/>
  <meta name="robots" content="index, nofollow"/>
  <title>$title</title>