sequencer: do not invent whitespace when transforming OIDs

dscho · gitster · commit c7b4d79c7dd1 · 2017-12-27T12:33:38.000-08:00
For commands that do not have an argument, there is no need to append a
trailing space at the end of the line.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/sequencer.c b/sequencer.c
@@ -2586,7 +2586,10 @@ int transform_todos(unsigned flags)
 			strbuf_addf(&buf, " %s", oid);
 		}
 		/* add all the rest */
-		strbuf_addf(&buf, " %.*s\n", item->arg_len, item->arg);
+		if (!item->arg_len)
+			strbuf_addch(&buf, '\n');
+		else
+			strbuf_addf(&buf, " %.*s\n", item->arg_len, item->arg);
 	}
 
 	i = write_message(buf.buf, buf.len, todo_file, 0);

Original file line number	Diff line number	Diff line change
`@@ -2586,7 +2586,10 @@ int transform_todos(unsigned flags)`
`2586`	`2586`	`strbuf_addf(&buf, " %s", oid);`
`2587`	`2587`	`}`
`2588`	`2588`	`/* add all the rest */`
`2589`		`- strbuf_addf(&buf, " %.*s\n", item->arg_len, item->arg);`
	`2589`	`+ if (!item->arg_len)`
	`2590`	`+ strbuf_addch(&buf, '\n');`
	`2591`	`+ else`
	`2592`	`+ strbuf_addf(&buf, " %.*s\n", item->arg_len, item->arg);`
`2590`	`2593`	`}`
`2591`	`2594`
`2592`	`2595`	`i = write_message(buf.buf, buf.len, todo_file, 0);`