Merge branch 'ew/svn-1.9.0-auth'

diff --git a/builtin/pull.c b/builtin/pull.c
index c713fe065beb2ac9d1c8058bf101094e99199766..10eff03967e0b9cb473d262b443949c55681fd1b 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -385,7 +385,7 @@ static void get_merge_heads(struct sha1_array *merge_heads)
 
        if (!(fp = fopen(filename, "r")))
                die_errno(_("could not open '%s' for reading"), filename);
-       while (strbuf_getline(&sb, fp, '\n') != EOF) {
+       while (strbuf_getline_lf(&sb, fp) != EOF) {
                if (get_sha1_hex(sb.buf, sha1))
                        continue;  /* invalid line: does not start with SHA1 */
                if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))