From: Jakub Narebski <jnareb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>, git@vger.kernel.org
Subject: Re: [PATCH (for maint)] gitweb: Fix fixed string (non-regexp) project search
Date: Mon, 5 Mar 2012 09:59:47 +0100 [thread overview]
Message-ID: <201203050959.47966.jnareb@gmail.com> (raw)
In-Reply-To: <7vfwdn631i.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
>
> > And here is the patch for maint
> > -->8-- -------------------------------------------------------- -->8--
> > Subject: gitweb: Fix fixed string (non-regexp) project search
> >
> > Use $search_regexp, where regex metacharacters are quoted, for
> > searching projects list, rather than $searchtext, which contains
> > original search term.
> >
> > Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
> > Signed-off-by: Jakub Narebski <jnareb@gmail.com>
> > ---
> > gitweb/gitweb.perl | 20 +++++++++++---------
> > 1 files changed, 11 insertions(+), 9 deletions(-)
> >
> > diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> > index d5dbd64..e248792 100755
> > --- a/gitweb/gitweb.perl
> > +++ b/gitweb/gitweb.perl
> > @@ -5290,9 +5290,11 @@ sub git_project_list_body {
> > @projects = fill_project_list_info(\@projects);
> > # searching projects require filling to be run before it
> > @projects = search_projects_list(\@projects,
> > - 'searchtext' => $searchtext,
> > - 'tagfilter' => $tagfilter)
> > - if ($tagfilter || $searchtext);
> > + 'search_regexp' => $search_regexp,
> > + 'tagfilter' => $tagfilter)
> > + if ($tagfilter || $search_regexp);
> > + # fill the rest
> > + @projects = fill_project_list_info(\@projects);
>
> Hmph, didn't you already call fill_project_list_info(\@projects) before
> search_projects_list() already?
True. Sorry about that.
Can you fix that, or should I resend?
--
Jakub Narebski
Poland
next prev parent reply other threads:[~2012-03-05 8:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 18:41 [PATCH (BUGFIX)] gitweb: Handle invalid regexp in regexp search Jakub Narebski
2012-02-28 19:45 ` Junio C Hamano
2012-02-29 15:56 ` Jakub Narebski
2012-03-02 19:44 ` Ramsay Jones
2012-03-02 22:34 ` [PATCH (BUGFIX)] gitweb: Fix fixed string (non-regexp) project search Jakub Narebski
2012-03-03 0:08 ` Junio C Hamano
2012-03-03 10:55 ` Jakub Narebski
2012-03-04 9:35 ` [PATCH (for maint)] " Jakub Narebski
2012-03-05 5:16 ` Junio C Hamano
2012-03-05 8:59 ` Jakub Narebski [this message]
2012-03-05 17:01 ` Junio C Hamano
2012-03-05 23:27 ` Junio C Hamano
2012-03-06 11:59 ` Jakub Narebski
2012-03-04 18:00 ` [PATCH (BUGFIX)] " Jakub Narebski
2012-03-04 23:08 ` Junio C Hamano
2012-03-05 9:03 ` Jakub Narebski
2012-03-05 19:06 ` Ramsay Jones
2012-03-06 12:40 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201203050959.47966.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ramsay@ramsay1.demon.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).