mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/web' into next

Browse Source 
* jn/web:
  gitweb: whitespace cleanup around '='
  gitweb: Use $hash_base as $search_hash if possible
This commit is contained in:
Junio C Hamano
2006-06-22 02:29:50 -07:00
parent fba6e3f039 8adc4bd4a5
commit 8ec7e19499
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gitweb/gitweb.cgi
View File

@ -322,10 +322,12 @@ EOF
$searchtext = ""; $searchtext = "";
} }
my $search_hash; my $search_hash;
if (defined $hash) { if (defined $hash_base) {
$search_hash = $hash_base;
} elsif (defined $hash) {
$search_hash = $hash; $search_hash = $hash;
} else { } else {
$search_hash = "HEAD"; $search_hash = "HEAD";
} }
$cgi->param("a", "search"); $cgi->param("a", "search");
$cgi->param("h", $search_hash); $cgi->param("h", $search_hash);
@ -1765,8 +1767,8 @@ sub git_opml {
} }
my $path = esc_html(chop_str($proj{'path'}, 25, 5)); my $path = esc_html(chop_str($proj{'path'}, 25, 5));
my $rss = "$my_url?p=$proj{'path'};a=rss"; my $rss = "$my_url?p=$proj{'path'};a=rss";
my $html = "$my_url?p=$proj{'path'};a=summary"; my $html = "$my_url?p=$proj{'path'};a=summary";
print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n"; print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
} }
print "</outline>\n". print "</outline>\n".
@ -1941,7 +1943,7 @@ sub git_commit {
"<td class=\"link\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . "<td class=\"link\">" . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") .
"</td>" . "</td>" .
"</tr>\n"; "</tr>\n";
my $parents = $co{'parents'}; my $parents = $co{'parents'};
foreach my $par (@$parents) { foreach my $par (@$parents) {
print "<tr>" . print "<tr>" .
"<td>parent</td>" . "<td>parent</td>" .