From: Jakub Narebski <redacted>
Date: Tue, 21 Jun 2011 06:41:16 +0000 (+0200)
Subject: gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
X-Git-Url: https://git.ladys.computer/Gitweb/commitdiff_plain/bc2b612fedaf5a6a0bd0fc4d1ae3fad19d8687a035dc064dfc7b6ee09cb9daf5

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/gitweb.perl b/gitweb.perl
index dacd4dc..bc3dd5e 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -329,6 +329,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];
@@ -343,6 +344,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];