From: Junio C Hamano Date: Wed, 16 Dec 2015 22:03:17 GMT Subject: [PATCH v2 16/17] grep: read -f file with strbuf_getline_crlf() Message-ID: <1450303398-25900-17-git-send-email-gitster@pobox.com> In-Reply-To: <1450303398-25900-1-git-send-email-gitster@pobox.com> 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_crlf() eat the last "^M^J", leaving just the single "^M" as the pattern. Signed-off-by: Junio C Hamano --- builtin/grep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/grep.c b/builtin/grep.c index d04f440..df162f1 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(&sb, patterns, '\n') == 0) { + while (strbuf_getline_crlf(&sb, patterns) == 0) { /* ignore empty line like grep does */ if (sb.len == 0) continue; -- 2.7.0-rc1-83-ga8b6b9e