Re: [PATCH (for maint)] gitweb: Fix fixed string (non-regexp) project search
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 5, 2012, 17:01 UTC
- Message-ID
- <7vd38r2d8y.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <201203050959.47966.jnareb@gmail.com>
Jakub Narebski <jnareb@gmail.com> writes:
Show 15 quoted lines
> Junio C Hamano wrote: >> Jakub Narebski <jnareb@gmail.com> writes: >> >> > And here is the patch for maint >> ... >> > + 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?
Could you check the following two diffs?
$ git show debd1c2
This is jn/maint-do-not-match-with-unsanitized-searchtext that should be merged to maintenance track that lack the lazy filling.
And then
$ git show --first-parent d4b52c2
This is how the above was merged to 'pu' and the conflict resolution should be the same when we merge it to 'master'. As our @projects may still be only sparsely filled when search_projects_list() returns, we do call fill_project_list_info(\@projects) ourselves with the lazy filling codebase.
There are a few places I noticed that check $searchtext to see if we are running a search, and techinically $search_regexp might be a more correct thing to use, but I do not think it matters that much.
Thanks.