summaryrefslogtreecommitdiff
path: root/builtin-grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-05 17:16:47 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-05 18:57:58 -0800
commitb67a43bb8f4a8ffb64f26b7351c3b0b90239696a (patch)
tree32e7062fff50678766d282524ee8da6f8fb35ff1 /builtin-grep.c
parent62c666a7034a3aed6792280589bb78205781aa68 (diff)
downloadgit-b67a43bb8f4a8ffb64f26b7351c3b0b90239696a.tar.gz
grep with unmerged index
We called flush_grep() every time we saw an unmerged entry in the index. If we happen to find an unmerged entry before we saw more than two paths, we incorrectly declared that the user had too many non-paths options in front. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-grep.c')
-rw-r--r--builtin-grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-grep.c b/builtin-grep.c
index c7b45c4d58..185876b0a6 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)