summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-15 20:50:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-15 20:54:00 (GMT)
commit7e622650d756955a94f546866eddd51506aa93a3 (patch)
tree7eb51da4665f07adb7e0ee26ab3d6877eabadb37 /git.c
parent885d211e714b3787cd059e347694f9b24e1db1f3 (diff)
downloadgit-7e622650d756955a94f546866eddd51506aa93a3.zip
git-7e622650d756955a94f546866eddd51506aa93a3.tar.gz
git-7e622650d756955a94f546866eddd51506aa93a3.tar.bz2
grep: prepare to run outside of a work tree
This moves the call to setup_git_directory() for running "grep" from the "git" wrapper to the implementation of the "grep" subcommand. A new variable "use_index" is always true at this stage in the series, and when it is on, we require that we are in a directory that is under git control. To make sure we die the same way, we make a second call into setup_git_directory() when we detect this situation. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index 11544cd..ad07473 100644
--- a/git.c
+++ b/git.c
@@ -317,7 +317,7 @@ static void handle_internal_command(int argc, const char **argv)
{ "fsck-objects", cmd_fsck, RUN_SETUP },
{ "gc", cmd_gc, RUN_SETUP },
{ "get-tar-commit-id", cmd_get_tar_commit_id },
- { "grep", cmd_grep, RUN_SETUP | USE_PAGER },
+ { "grep", cmd_grep, USE_PAGER },
{ "help", cmd_help },
{ "init", cmd_init_db },
{ "init-db", cmd_init_db },