git grep shows the same hit repeatedly for unmerged paths
When the index is unmerged, e.g. $ git ls-files -u 100644 faf413748eb6ccb15161a212156c5e348302b1b6 1 setup.c 100644 145eca50f41d811c4c8fcb21ed2604e6b2971aba 2 setup.c 100644 cb9558c49b6027bf225ba2a6154c4d2a52bcdbe2 3 setup.c running "git grep" for work tree files repeats hits for each unmerged stage. $ git grep -n -e setup_work_tree -- '*.[ch]' setup.c:209:void setup_work_tree(void) setup.c:209:void setup_work_tree(void) setup.c:209:void setup_work_tree(void) This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 5, 2007 at 16:13 UTC
6326cee51b21d67e1335ead285cb52b83234b2b4
1 file changed
+6
-6
builtin-grep.c
+6
-6
@@ -343,12 +343,12 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
343
memcpy(name + 2, ce->name, len + 1);
344
}
345
argv[argc++] = name;
346
- if (argc < MAXARGS)
347
- continue;
348
- status = flush_grep(opt, argc, nr, argv, &kept);
349
- if (0 < status)
350
- hit = 1;
351
- argc = nr + kept;
346
+ if (MAXARGS <= argc) {
347
+ status = flush_grep(opt, argc, nr, argv, &kept);
348
+ if (0 < status)
349
+ hit = 1;
350
+ argc = nr + kept;
351
+ }
352
if (ce_stage(ce)) {
353
do {
354
i++;