diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-05 22:03:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-05 22:03:47 -0800 |
| commit | fe61935007b6803ce116e233316e4ff51de02be6 (patch) | |
| tree | 0a9120a6a8a6d80851f5ca348d31b6022c70c2de /builtin-grep.c | |
| parent | a1f611d5d03d7849f4d7f47f5bd39b5c44808bb5 (diff) | |
| parent | d8e21ba8967f43b61fc2fd50dd749ff8f0c6592a (diff) | |
| download | git-fe61935007b6803ce116e233316e4ff51de02be6.tar.gz git-fe61935007b6803ce116e233316e4ff51de02be6.tar.xz | |
Merge branch 'maint'
* maint:
Remove a couple of duplicated include
grep with unmerged index
git-daemon: fix remote port number in log entry
git-svn: t9114: verify merge commit message in test
git-svn: fix dcommit clobbering when committing a series of diffs
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 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) |