[PATCH v2 03/17] update-index: read --index-info with strbuf_getline_crlf()
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:07:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH v2 03/17] update-index: read --index-info with strbuf_getline_crlf() · Junio C Hamano <hidden>
Signed-off-by: Junio C Hamano <redacted> --- builtin/update-index.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 7431938..a7a9a7e 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c@@ -473,7 +473,9 @@ static void read_index_info(int line_termination) struct strbuf buf = STRBUF_INIT; struct strbuf uq = STRBUF_INIT; - while (strbuf_getline(&buf, stdin, line_termination) != EOF) { + while ((line_termination + ? strbuf_getline_crlf(&buf, stdin) + : strbuf_getline(&buf, stdin, '\0')) != EOF) { char *ptr, *tab; char *path_name; unsigned char sha1[20];
--
2.7.0-rc1-83-ga8b6b9e