git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jakub Narebski <jnareb@gmail.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, 05 Mar 2012 09:01:33 -0800	[thread overview]
Message-ID: <7vd38r2d8y.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <201203050959.47966.jnareb@gmail.com> (Jakub Narebski's message of "Mon, 5 Mar 2012 09:59:47 +0100")

Jakub Narebski <jnareb@gmail.com> writes:

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

  reply	other threads:[~2012-03-05 17:01 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
2012-03-05 17:01               ` Junio C Hamano [this message]
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=7vd38r2d8y.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.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).