From: Jonathan Nieder Date: Sat, 07 Aug 2010 21:56:47 GMT Subject: [PATCH v3] gitweb: clarify search results page when no matching commit found Message-ID: <20100807215647.GB2969@burratino> In-Reply-To: When searching commits for a string that never occurs, the results page looks something like this: projects / foo.git / search \o/ summary | ... | tree [commit] search: [ kfjdkas ] [ ]re first ⋅ prev ⋅ next Merge branch 'maint' Foo: a demonstration project Without a list of hits to compare it to, the header describing the commit named by the hash parameter (usually HEAD) may itself look like a hit. Add some text (“No match.”) to replace the empty list of hits and avoid this confusion. While at it, remove some nearby dead code, left behind from a simplification a few years ago (v1.5.4-rc0~276^2~4, 2007-11-01). Noticed-by: Erick Mattos Signed-off-by: Jonathan Nieder Acked-by: Jakub Narebski --- changes relative to v2[1]: - better newline placement in the produced HTML. Erick Mattos wrote: > What's up to: > > http://thread.gmane.org/gmane.comp.version-control.git/151402/focus=151414 Hopefully third time’s the charm. Test reports welcome as always. gitweb/gitweb.perl | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 8b02767..4efeebc 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -6521,12 +6521,13 @@ sub git_search { $paging_nav .= " ⋅ next"; } - if ($#commitlist >= 100) { - } - git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav); git_print_header_div('commit', esc_html($co{'title'}), $hash); - git_search_grep_body(\@commitlist, 0, 99, $next_link); + if ($page == 0 && !@commitlist) { + print "

No match.

\n"; + } else { + git_search_grep_body(\@commitlist, 0, 99, $next_link); + } } if ($searchtype eq 'pickaxe') { -- 1.7.2.1.544.ga752d.dirty