Supporess suffix ".git" on path breadcrumbs in tree mode.

[gitweb-sgk] / gitweb.cgi

diff --git a/gitweb.cgi b/gitweb.cgi
index 57b60c4..6ee17d5 100755 (executable)
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -4549,8 +4549,10 @@ sub git_print_page_path {
 
 
        print "<div class=\"page_path\">";
 
 
        print "<div class=\"page_path\">";

+       my $pretty_project = $project;
+       $pretty_project =~ s/\/\.git$//;

        print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),
        print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),

-                     -title => 'tree root'}, to_utf8("[$project]"));
+                     -title => 'tree root'}, to_utf8("[$pretty_project]"));

        print " / ";
        if (defined $name) {
                my @dirname = split '/', $name;
        print " / ";
        if (defined $name) {
                my @dirname = split '/', $name;


@@ -5727,9 +5729,11 @@ sub git_project_list_rows {
                        }
                        print "</td>\n";
                }
                        }
                        print "</td>\n";
                }

+               my $pretty_path = $pr->{'path'};
+               $pretty_path =~ s/\/\.git$//;

                print "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"),
                                        -class => "list"},
                print "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"),
                                        -class => "list"},

-                                      esc_html_match_hl($pr->{'path'}, $search_regexp)) .
+                                      esc_html_match_hl($pretty_path, $search_regexp)) .

                      "</td>\n" .
                      "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"),
                                        -class => "list",
                      "</td>\n" .
                      "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"),
                                        -class => "list",


@@ -6581,6 +6585,7 @@ sub git_summary {
        @url_list = map { "$_/$project" } @git_base_url_list unless @url_list;
        foreach my $git_url (@url_list) {
                next unless $git_url;
        @url_list = map { "$_/$project" } @git_base_url_list unless @url_list;
        foreach my $git_url (@url_list) {
                next unless $git_url;

+               $git_url =~ s/\.git$//;

                print format_repo_url($url_tag, $git_url);
                $url_tag = "";
        }
                print format_repo_url($url_tag, $git_url);
                $url_tag = "";
        }