Merge branch 'nd/worktree-add-B'

diff --git a/builtin/grep.c b/builtin/grep.c
index 6c030dad6b7782478a07a4feb6020e4a30e7f7a0..8c516a95438e5aa997049da24160764ff4ca985c 100644 (file)
--- 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_lf(&sb, patterns) == 0) {
+       while (strbuf_getline(&sb, patterns) == 0) {
                /* ignore empty line like grep does */
                if (sb.len == 0)
                        continue;