Merge branch 'jc/strbuf-getline'

diff --git a/builtin/commit.c b/builtin/commit.c
index 89bf6ad38abbbee068ca29bad2ce2a4b728fa388..b3bd2d41813f80d848afc199c2fae92cae6b6c11 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1690,7 +1690,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                if (fp == NULL)
                        die_errno(_("could not open '%s' for reading"),
                                  git_path_merge_head());
-               while (strbuf_getline(&m, fp, '\n') != EOF) {
+               while (strbuf_getline_lf(&m, fp) != EOF) {
                        struct commit *parent;
 
                        parent = get_merge_parent(m.buf);