summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2011-06-21 08:41:16 +0200
committerJunio C Hamano <gitster@pobox.com>2011-06-21 14:07:35 -0700
commita598ded1e2e9cc9f4ce93d091808b475839e6867 (patch)
treeda45f440093a7d549382e90f41aa7e98f825a5e2
parentdaab4eeafa0dc620d67ccb57c28e08f6f8b3868c (diff)
downloadgit-a598ded1e2e9cc9f4ce93d091808b475839e6867.tar.gz
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 <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 2 insertions, 0 deletions
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];