summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-25 19:04:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-25 19:04:19 (GMT)
commitfca9e0013eeaad45bff38f66667d2791a1edc53f (patch)
treeb487bf942d747ec16185d361b9249eb5034b7ca4 /builtin/grep.c
parent4f64464023d0bf7ce065f1dccaf267ca38b3521f (diff)
parentec83061156e18ce600384d3c57f90729a9295488 (diff)
downloadgit-fca9e0013eeaad45bff38f66667d2791a1edc53f.zip
git-fca9e0013eeaad45bff38f66667d2791a1edc53f.tar.gz
git-fca9e0013eeaad45bff38f66667d2791a1edc53f.tar.bz2
Merge branch 'rs/maint-grep-F'
"git grep -e '$pattern'", unlike the case where the patterns are read from a file, did not treat individual lines in the given pattern argument as separate regular expressions as it should.
Diffstat (limited to 'builtin/grep.c')
-rw-r--r--builtin/grep.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index 643938d..fe1726f 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -600,15 +600,12 @@ static int file_callback(const struct option *opt, const char *arg, int unset)
if (!patterns)
die_errno(_("cannot open '%s'"), arg);
while (strbuf_getline(&sb, patterns, '\n') == 0) {
- char *s;
- size_t len;
-
/* ignore empty line like grep does */
if (sb.len == 0)
continue;
- s = strbuf_detach(&sb, &len);
- append_grep_pat(grep_opt, s, len, arg, ++lno, GREP_PATTERN);
+ append_grep_pat(grep_opt, sb.buf, sb.len, arg, ++lno,
+ GREP_PATTERN);
}
if (!from_stdin)
fclose(patterns);