grep with unmerged index

gitster · gitster · commit b67a43bb8f4a · 2007-11-05T18:57:58.000-08:00
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 &lt;gitster@pobox.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ static int external_grep(struct grep_opt opt, const char *paths, int cached)`
`343`	`343`	`memcpy(name + 2, ce->name, len + 1);`
`344`	`344`	`}`
`345`	`345`	`argv[argc++] = name;`
`346`		`- if (argc < MAXARGS && !ce_stage(ce))`
	`346`	`+ if (argc < MAXARGS)`
`347`	`347`	`continue;`
`348`	`348`	`status = flush_grep(opt, argc, nr, argv, &kept);`
`349`	`349`	`if (0 < status)`