summaryrefslogtreecommitdiff
path: root/builtin-grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-05 09:20:01 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-05 09:27:25 -0800
commit3c8f6c8c4f00414e66076c2c97c834d01f828491 (patch)
tree983851e2396d04bfb3f640fe3ab07d8d8bfd2dd3 /builtin-grep.c
parent8bff7c5383ed833bd1df9c8d85c00a27af3e5b02 (diff)
downloadgit-3c8f6c8c4f00414e66076c2c97c834d01f828491.tar.gz
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 'builtin-grep.c')
-rw-r--r--builtin-grep.c40
1 files changed, 0 insertions, 40 deletions
diff --git a/builtin-grep.c b/builtin-grep.c
index 0ef849cb84..26d4deb1cc 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -14,7 +14,6 @@
#include "userdiff.h"
#include "grep.h"
#include "quote.h"
-#include "dir.h"
#ifndef NO_PTHREADS
#include "thread-utils.h"
@@ -646,24 +645,6 @@ static int grep_object(struct grep_opt *opt, const char **paths,
die("unable to grep from object of type %s", typename(obj->type));
}
-static int grep_directory(struct grep_opt *opt, const char **paths)
-{
- struct dir_struct dir;
- int i, hit = 0;
-
- memset(&dir, 0, sizeof(dir));
- setup_standard_excludes(&dir);
-
- fill_directory(&dir, paths);
- for (i = 0; i < dir.nr; i++) {
- hit |= grep_file(opt, dir.entries[i]->name);
- if (hit && opt->status_only)
- break;
- }
- free_grep_patterns(opt);
- return hit;
-}
-
static int context_callback(const struct option *opt, const char *arg,
int unset)
{
@@ -758,12 +739,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
const char **paths = NULL;
int i;
int dummy;
- int nongit = 0, use_index = 1;
struct option options[] = {
OPT_BOOLEAN(0, "cached", &cached,
"search in index instead of in the work tree"),
- OPT_BOOLEAN(0, "index", &use_index,
- "--no-index finds in contents not managed by git"),
OPT_GROUP(""),
OPT_BOOLEAN('v', "invert-match", &opt.invert,
"show non-matching lines"),
@@ -846,8 +824,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
OPT_END()
};
- prefix = setup_git_directory_gently(&nongit);
-
/*
* 'git grep -h', unlike 'git grep -h <pattern>', is a request
* to show usage information and exit.
@@ -885,10 +861,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
PARSE_OPT_STOP_AT_NON_OPTION |
PARSE_OPT_NO_INTERNAL_HELP);
- if (use_index && nongit)
- /* die the same way as if we did it at the beginning */
- setup_git_directory();
-
/* First unrecognized non-option token */
if (argc > 0 && !opt.pattern_list) {
append_grep_pattern(&opt, argv[0], "command line", 0,
@@ -950,18 +922,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
paths[1] = NULL;
}
- if (!use_index) {
- int hit;
- if (cached)
- die("--cached cannot be used with --no-index.");
- if (list.nr)
- die("--no-index cannot be used with revs.");
- hit = grep_directory(&opt, paths);
- if (use_threads)
- hit |= wait_all();
- return !hit;
- }
-
if (!list.nr) {
int hit;
if (!cached)