[PATCH v2 11/17] clone/sha1_file: read info/alternates with strbuf_getline_crlf()
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:07:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
$GIT_OBJECT_DIRECTORY/info/alternates is a text file that can be edited with a DOS editor. We do not want to use the real path with CR appended at the end. Signed-off-by: Junio C Hamano <redacted> --- builtin/clone.c | 2 +- sha1_file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 9eaecd9..0a85243 100644
--- 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(&line, in, '\n') != EOF) { + while (strbuf_getline_crlf(&line, in) != EOF) { char *abs_path; if (!line.len || line.buf[0] == '#') continue;
diff --git a/sha1_file.c b/sha1_file.c
index 50896ff..7a748f2 100644
--- a/sha1_file.c
+++ b/sha1_file.c@@ -395,7 +395,7 @@ void add_to_alternates_file(const char *reference) struct strbuf line = STRBUF_INIT; int found = 0; - while (strbuf_getline(&line, in, '\n') != EOF) { + while (strbuf_getline_crlf(&line, in) != EOF) { if (!strcmp(reference, line.buf)) { found = 1; break;
--
2.7.0-rc1-83-ga8b6b9e