summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-29 00:10:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-29 00:10:14 (GMT)
commitb62624b51a54325e6884c197352dc0dcef700325 (patch)
tree2a5c68bae2133bbb762253f183abcc6f00f8faef /builtin/grep.c
parent116a866bf50da9b893623ebb940e1c6bff7a29bc (diff)
parent1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2 (diff)
downloadgit-b62624b51a54325e6884c197352dc0dcef700325.zip
git-b62624b51a54325e6884c197352dc0dcef700325.tar.gz
git-b62624b51a54325e6884c197352dc0dcef700325.tar.bz2
Merge branch 'jc/strbuf-getline'
The preliminary clean-up for jc/peace-with-crlf topic. * jc/strbuf-getline: strbuf: give strbuf_getline() to the "most text friendly" variant checkout-index: there are only two possible line terminations update-index: there are only two possible line terminations check-ignore: there are only two possible line terminations check-attr: there are only two possible line terminations mktree: there are only two possible line terminations strbuf: introduce strbuf_getline_{lf,nul}() strbuf: make strbuf_getline_crlf() global strbuf: miniscule style fix
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 5526fd7..6c030da 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -573,7 +573,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_lf(&sb, patterns) == 0) {
/* ignore empty line like grep does */
if (sb.len == 0)
continue;