diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-18 15:15:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-18 15:21:12 -0800 |
| commit | 4a44b9ea51ef5183245c23473a33714a62ed224d (patch) | |
| tree | ced7043b60d30e8bba07b2bc10eb36a434295efe /builtin-grep.c | |
| parent | 4e0da76318c44436286eeeca2b711d82c1098493 (diff) | |
| parent | 005e2dfdf299a7d869fa9ec819171fba574f42eb (diff) | |
| download | git-4a44b9ea51ef5183245c23473a33714a62ed224d.tar.gz | |
Merge branch 'maint' to synchronize with 1.5.3.6
* maint:
GIT 1.5.3.6
grep -An -Bm: fix invocation of external grep command
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 185876b0a6..bbf747fc7b 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -294,7 +294,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) if (opt->pre_context) { push_arg("-B"); len += snprintf(argptr, sizeof(randarg)-len, - "%u", opt->pre_context); + "%u", opt->pre_context) + 1; if (sizeof(randarg) <= len) die("maximum length of args exceeded"); push_arg(argptr); @@ -303,7 +303,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) if (opt->post_context) { push_arg("-A"); len += snprintf(argptr, sizeof(randarg)-len, - "%u", opt->post_context); + "%u", opt->post_context) + 1; if (sizeof(randarg) <= len) die("maximum length of args exceeded"); push_arg(argptr); @@ -313,7 +313,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) else { push_arg("-C"); len += snprintf(argptr, sizeof(randarg)-len, - "%u", opt->post_context); + "%u", opt->post_context) + 1; if (sizeof(randarg) <= len) die("maximum length of args exceeded"); push_arg(argptr); |