Thread (98 messages) flat view 98 messages, 5 authors, 2016-06-15

Re: [PATCH v2 04/17] update-index: read list of paths with strbuf_getline_crlf() under --stdin

From: Johannes Schindelin <hidden>
Date: 2016-06-15 23:07:37

Hi Junio,

On Wed, 16 Dec 2015, Junio C Hamano wrote:
quoted hunk ↗ jump to hunk
diff --git a/builtin/update-index.c b/builtin/update-index.c
index a7a9a7e..3a6c5b2 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -1075,7 +1075,10 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 		struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
 
 		setup_work_tree();
-		while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
+
+		while ((line_termination
+			? strbuf_getline_crlf(&buf, stdin)
+			: strbuf_getline(&buf, stdin, '\0')) != EOF) {
 			char *p;
 			if (line_termination && buf.buf[0] == '"') {
Again, I think it would make things clearer and more future proof if we
changed the logic to talk about nul_delimited instead of line_termination.

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help