From: Jakub Narebski Date: Tue, 21 Jun 2011 06:41:16 +0000 (+0200) Subject: gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled X-Git-Tag: v1.7.6-rc3~2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a598ded1e2e9cc9f4ce93d091808b475839e6867;p=thirdparty%2Fgit.git gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled Both 'pickaxe' (searching changes) and 'grep' (searching files) require basic 'search' feature to be enabled to work. Enabling e.g. only 'pickaxe' won't work. Add a comment about this. Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index f8db40a1c2..2fd438905c 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -320,6 +320,7 @@ our %feature = ( # Enable grep search, which will list the files in currently selected # tree containing the given string. Enabled by default. This can be # potentially CPU-intensive, of course. + # Note that you need to have 'search' feature enabled too. # To enable system wide have in $GITWEB_CONFIG # $feature{'grep'}{'default'} = [1]; @@ -334,6 +335,7 @@ our %feature = ( # Enable the pickaxe search, which will list the commits that modified # a given string in a file. This can be practical and quite faster # alternative to 'blame', but still potentially CPU-intensive. + # Note that you need to have 'search' feature enabled too. # To enable system wide have in $GITWEB_CONFIG # $feature{'pickaxe'}{'default'} = [1];