Merge branch 'fa/merge-recursive-no-rename'

diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index d3cb4e53453281c60c0ff97a976a2aa621b087a8..f7d3567dd0ce2d75778d6cf011961c0f203432b4 100644 (file)
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -61,7 +61,7 @@ static void hash_stdin_paths(const char *type, int no_filters, unsigned flags,
        struct strbuf buf = STRBUF_INIT;
        struct strbuf unquoted = STRBUF_INIT;
 
-       while (strbuf_getline_lf(&buf, stdin) != EOF) {
+       while (strbuf_getline(&buf, stdin) != EOF) {
                if (buf.buf[0] == '"') {
                        strbuf_reset(&unquoted);
                        if (unquote_c_style(&unquoted, buf.buf, NULL))