summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-05 17:20:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-05 17:27:25 (GMT)
commit3c8f6c8c4f00414e66076c2c97c834d01f828491 (patch)
tree983851e2396d04bfb3f640fe3ab07d8d8bfd2dd3 /git.c
parent8bff7c5383ed833bd1df9c8d85c00a27af3e5b02 (diff)
downloadgit-3c8f6c8c4f00414e66076c2c97c834d01f828491.zip
git-3c8f6c8c4f00414e66076c2c97c834d01f828491.tar.gz
git-3c8f6c8c4f00414e66076c2c97c834d01f828491.tar.bz2
Revert 30816237 and 7e62265
It seems that we have bad interaction with the code related to GIT_WORK_TREE and "grep --no-index", and broke running grep inside the .git directory. For now, just revert it and resurrect it after 1.7.0 ships. 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 b3e23f1..4c3028c 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, USE_PAGER },
+ { "grep", cmd_grep, RUN_SETUP | USE_PAGER },
{ "hash-object", cmd_hash_object },
{ "help", cmd_help },
{ "index-pack", cmd_index_pack },