diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-09 21:13:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-09 21:13:46 -0800 |
| commit | 0d9d89f61c58f72d96585a61defb0634873c38ac (patch) | |
| tree | fcb314481bb669dcf1f33ba3934786c1dcc51b12 /builtin-grep.c | |
| parent | Merge branch 'jk/terse-push' into aw/mirror-push (diff) | |
| parent | Update draft release notes for 1.5.4 (diff) | |
| download | tgif-0d9d89f61c58f72d96585a61defb0634873c38ac.tar.xz | |
Merge master into aw/mirror-push
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 2 |
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) |