"Martin Langhoff" <martin.langhoff@xxxxxxxxx> writes: > Strange behaviour of git grep on one of the projects I hack on... > > $ git --version > git version 1.5.3.5.561.g140d > > $ git grep LOB lib > fatal: insanely many options to grep > > After a bit of head-scratching I realised I was in the middle of a > merge, with some unresolved paths in the lib directory. A bit of > testing shows that the unresolved index is probably the problem: > > $ git grep LOB lib > fatal: insanely many options to grep > > # an unresolved file > $ git grep LOB lib/accesslib.php > fatal: insanely many options to grep I think 36f2587ffb6802cb38071510810f48cddfc4f34a (grep: do not skip unmerged entries when grepping in the working tree.) is the dud one. Would this help? diff --git a/builtin-grep.c b/builtin-grep.c index c7b45c4..185876b 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -343,7 +343,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) memcpy(name + 2, ce->name, len + 1); } argv[argc++] = name; - if (argc < MAXARGS && !ce_stage(ce)) + if (argc < MAXARGS) continue; status = flush_grep(opt, argc, nr, argv, &kept); if (0 < status) - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
