diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-22 02:29:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-22 02:29:50 -0700 |
| commit | 8ec7e19499a5885ba1bfe14bc7e8110774ce1dee (patch) | |
| tree | b9edb288c0566fa7171ffa0f6723955610290df3 | |
| parent | Merge branch 'master' into next (diff) | |
| parent | gitweb: whitespace cleanup around '=' (diff) | |
| download | tgif-8ec7e19499a5885ba1bfe14bc7e8110774ce1dee.tar.xz | |
Merge branch 'jn/web' into next
* jn/web:
gitweb: whitespace cleanup around '='
gitweb: Use $hash_base as $search_hash if possible
| -rwxr-xr-x | gitweb/gitweb.cgi | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi index f2e50462d9..035e76d0a3 100755 --- a/gitweb/gitweb.cgi +++ b/gitweb/gitweb.cgi @@ -322,10 +322,12 @@ EOF $searchtext = ""; } my $search_hash; - if (defined $hash) { + if (defined $hash_base) { + $search_hash = $hash_base; + } elsif (defined $hash) { $search_hash = $hash; } else { - $search_hash = "HEAD"; + $search_hash = "HEAD"; } $cgi->param("a", "search"); $cgi->param("h", $search_hash); @@ -1765,8 +1767,8 @@ sub git_opml { } my $path = esc_html(chop_str($proj{'path'}, 25, 5)); - my $rss = "$my_url?p=$proj{'path'};a=rss"; - my $html = "$my_url?p=$proj{'path'};a=summary"; + my $rss = "$my_url?p=$proj{'path'};a=rss"; + my $html = "$my_url?p=$proj{'path'};a=summary"; print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\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>" . "</tr>\n"; - my $parents = $co{'parents'}; + my $parents = $co{'parents'}; foreach my $par (@$parents) { print "<tr>" . "<td>parent</td>" . |