From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Nov 2007 01:16:47 +0000 (-0800)
Subject: grep with unmerged index
X-Git-Tag: v1.5.3.6~39
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b67a43bb8f4a8ffb64f26b7351c3b0b90239696a;p=git.git

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>
---

diff --git a/builtin-grep.c b/builtin-grep.c
index c7b45c4d5..185876b0a 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)