summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-28 20:53:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-15 18:35:07 (GMT)
commita551843129dc4d329d4f7915a9c10120963acd7d (patch)
tree1b1cf74faaa641eb377a3d5a907ef19df923ccd7 /builtin/grep.c
parent933bea922c202a7ff9b133a5cca4a805a7013aa2 (diff)
downloadgit-a551843129dc4d329d4f7915a9c10120963acd7d.zip
git-a551843129dc4d329d4f7915a9c10120963acd7d.tar.gz
git-a551843129dc4d329d4f7915a9c10120963acd7d.tar.bz2
grep: read -f file with strbuf_getline()
List of patterns file could come from a DOS editor. This is iffy; you may actually be trying to find a line with ^M in it on a system whose line ending is LF. You can of course work it around by having a line that has "^M^M^J", let the strbuf_getline() eat the last "^M^J", leaving just the single "^M" as the pattern. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/grep.c')
-rw-r--r--builtin/grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index 5a5beb8..801ce60 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -562,7 +562,7 @@ static int file_callback(const struct option *opt, const char *arg, int unset)
patterns = from_stdin ? stdin : fopen(arg, "r");
if (!patterns)
die_errno(_("cannot open '%s'"), arg);
- while (strbuf_getline_lf(&sb, patterns) == 0) {
+ while (strbuf_getline(&sb, patterns) == 0) {
/* ignore empty line like grep does */
if (sb.len == 0)
continue;