diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2008-03-02 16:57:14 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-02 15:26:31 -0800 |
| commit | 6dfbb304be5a5e260321c5f47626582dbe2c62f0 (patch) | |
| tree | 79db1bc404ac040c1e68468703b8ed7c8bfce5d9 /gitweb | |
| parent | b00ac8c729258f7117c74838133d57c40536b48b (diff) | |
| download | git-6dfbb304be5a5e260321c5f47626582dbe2c62f0.tar.gz git-6dfbb304be5a5e260321c5f47626582dbe2c62f0.tar.xz | |
gitweb: Mark first match when searching commit messages
Due to greediness of a pattern, gitweb used to mark (show) last match
in line, if there are more than one match in line. Now it shows first.
Showing all matches in a line would require further work.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 20dc5d59c..922dee98b 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3837,7 +3837,7 @@ sub git_search_grep_body { chop_and_escape_str($co{'title'}, 50) . "<br/>"); my $comment = $co{'comment'}; foreach my $line (@$comment) { - if ($line =~ m/^(.*)($search_regexp)(.*)$/i) { + if ($line =~ m/^(.*?)($search_regexp)(.*)$/i) { my ($lead, $match, $trail) = ($1, $2, $3); $match = chop_str($match, 70, 5, 'center'); my $contextlen = int((80 - length($match))/2); |