Merge branch 'jk/notes-merge-from-anywhere'

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