Merge branch 'dg/subtree-test'

diff --git a/builtin/clone.c b/builtin/clone.c
index 81e238f738bae80b19524fee83f9046be3571cc2..bcba0805e1c9c5691c2e876f9748a2cf492b1c70 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -339,7 +339,7 @@ static void copy_alternates(struct strbuf *src, struct strbuf *dst,
        FILE *in = fopen(src->buf, "r");
        struct strbuf line = STRBUF_INIT;
 
-       while (strbuf_getline_lf(&line, in) != EOF) {
+       while (strbuf_getline(&line, in) != EOF) {
                char *abs_path;
                if (!line.len || line.buf[0] == '#')
                        continue;