[PATCH 1/2] gitweb: Fix file links in "grep" search
From: Jakub Narebski <hidden>
Date: 2016-06-15 22:52:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 1/2] gitweb: Fix file links in "grep" search · Junio C Hamano <hidden>
There were two bugs in generating file links (links to "blob" view),
one hidden by the other. The correct way of generating file link is
href(action=>"blob", hash_base=>$co{'id'},
file_name=>$file);
It was $co{'hash'} (this key does not exist, and therefore this is
undef), and 'hash' instead of 'hash_base'.
To have this fix applied in single place, this commit also reduces
code duplication by saving file link (which is used for line links) in
$file_href.
Reported-by: Thomas Perl <redacted>
Signed-off-by: Jakub Narebski <redacted>
---
On Wed, 4 Jan 2012, Jakub Narębski wrote:On Wed, Jan 4, 2012 at 1:28 AM, Junio C Hamano [off-list ref] wrote:quoted
Thomas Perl [off-list ref] writes:quoted
I think I found a bug in gitweb when grep'ing for text in a branch different from "master". Here's how to reproduce it:Thanks for a detailed report (and thanks for gpodder ;-). Jakub, care to take a look?I see the bug: it should be 'hash_base' not 'hash' in href() creating link to "blob" view in git_search_files(). I'll try to send a fix soon...
Actually there were two errors, one hiding the other... Thomas, could you check if this fixes your issue? gitweb/gitweb.perl | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index fc41b07..fa58156 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl@@ -5852,7 +5852,7 @@ sub git_search_files { my $lastfile = ''; while (my $line = <$fd>) { chomp $line; - my ($file, $lno, $ltext, $binary); + my ($file, $file_href, $lno, $ltext, $binary); last if ($matches++ > 1000); if ($line =~ /^Binary file (.+) matches$/) { $file = $1;
@@ -5867,10 +5867,10 @@ sub git_search_files { } else { print "<tr class=\"light\">\n"; } + $file_href = href(action=>"blob", hash_base=>$co{'id'}, + file_name=>$file); print "<td class=\"list\">". - $cgi->a({-href => href(action=>"blob", hash=>$co{'hash'}, - file_name=>"$file"), - -class => "list"}, esc_path($file)); + $cgi->a({-href => $file_href, -class => "list"}, esc_path($file)); print "</td><td>\n"; $lastfile = $file; }
@@ -5888,10 +5888,9 @@ sub git_search_files { $ltext = esc_html($ltext, -nbsp=>1); } print "<div class=\"pre\">" . - $cgi->a({-href => href(action=>"blob", hash=>$co{'hash'}, - file_name=>"$file").'#l'.$lno, - -class => "linenr"}, sprintf('%4i', $lno)) - . ' ' . $ltext . "</div>\n"; + $cgi->a({-href => $file_href.'#l'.$lno, + -class => "linenr"}, sprintf('%4i', $lno)) . + ' ' . $ltext . "</div>\n"; } } if ($lastfile) {
--
1.7.6