From: Jakub Narebski <jnareb@gmail.com>
Date: Sun, 2 Mar 2008 15:57:14 +0000 (+0100)
Subject: gitweb: Mark first match when searching commit messages
X-Git-Tag: v1.5.5-rc0~85
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6dfbb304be5a5e260321c5f47626582dbe2c62f0;p=git.git

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>
---

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);