diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-08-09 13:05:47 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-09 13:05:47 -0700 |
commit | 0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f (patch) | |
tree | 3266384afc1dc4717f49b1bd77f9ab734cacf8a0 /gitweb | |
parent | d7d1c79cec6601db3a470e59240aa6ffab8b1405 (diff) | |
parent | 497d9c343902591e98a6612385d529816420ea94 (diff) | |
download | git-0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f.tar.gz git-0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f.tar.xz |
Merge branch 'maint'
* maint:
gitweb: clarify search results page when no matching commit found
Documentation: add a FILES section for show-ref
Makefile: add missing dependency on http.h
Makefile: add missing dependencies on url.h
Documentation/git-log: Clarify --full-diff
git-rebase: fix typo when parsing --force-rebase
imap-send: Fix sprintf usage
prune: allow --dry-run for -n and --verbose for -v
notes: allow --dry-run for -n and --verbose for -v
Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
Documentation: cite git-am from git-apply
t7003: fix subdirectory-filter test
Allow "check-ref-format --branch" from subdirectory
check-ref-format: handle subcommands in separate functions
pretty-options.txt: match --format's documentation with implementation.
Diffstat (limited to 'gitweb')
-rwxr-xr-x | gitweb/gitweb.perl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 8b0276727..4efeebc22 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 "<p>No match.</p>\n"; + } else { + git_search_grep_body(\@commitlist, 0, 99, $next_link); + } } if ($searchtype eq 'pickaxe') { |