Junio C Hamano wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: >> Jakub Narebski <jnareb@xxxxxxxxx> writes: >> >>>> 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. > > The latter is now > > $ git show --first-parent 657c6d0 > > on today's 'pu'. > > Thanks. Both look all right (the only difference in diff is use of $searchtext vs $search_regexp global variable to check if search is on, but for that purpose those variables are equivalent). Thanks. -- Jakub Narebski Poland -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html