summaryrefslogtreecommitdiff
path: root/graph.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-09-29 04:37:51 -0400
committerJunio C Hamano <gitster@pobox.com>2016-09-29 16:43:47 -0700
commit16477935245a522d99d0dd7e346638c02542f1d0 (patch)
tree469a3be766092e050b4f96dad4bc4342ac5993eb /graph.c
parent0b65a8dbdb38962e700ee16776a3042beb489060 (diff)
downloadgit-16477935245a522d99d0dd7e346638c02542f1d0.tar.gz
graph: fix extra spaces in graph_padding_linejk/graph-padding-fix
The graph_padding_line() function outputs a series of "|" columns, and then pads with spaces to graph->width by calling graph_pad_horizontally(). However, we tell the latter that we wrote graph->num_columns characters, which is not true; we also needed spaces between the columns. Let's keep a count of how many characters we've written, which is what all the other callers of graph_pad_horizontally() do. Without this, any output that is written at the end of a padding line will be bumped out by at least an extra graph->num_columns spaces. Presumably nobody ever noticed the bug because there's no code path that actually writes to the end of a padding line. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'graph.c')
-rw-r--r--graph.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/graph.c b/graph.c
index 1350bdde3b..5ad62b8a83 100644
--- a/graph.c
+++ b/graph.c
@@ -1138,6 +1138,7 @@ int graph_next_line(struct git_graph *graph, struct strbuf *sb)
static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
{
int i;
+ int chars_written = 0;
if (graph->state != GRAPH_COMMIT) {
graph_next_line(graph, sb);
@@ -1153,14 +1154,21 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
*/
for (i = 0; i < graph->num_columns; i++) {
struct column *col = &graph->columns[i];
+
strbuf_write_column(sb, col, '|');
- if (col->commit == graph->commit && graph->num_parents > 2)
- strbuf_addchars(sb, ' ', (graph->num_parents - 2) * 2);
- else
+ chars_written++;
+
+ if (col->commit == graph->commit && graph->num_parents > 2) {
+ int len = (graph->num_parents - 2) * 2;
+ strbuf_addchars(sb, ' ', len);
+ chars_written += len;
+ } else {
strbuf_addch(sb, ' ');
+ chars_written++;
+ }
}
- graph_pad_horizontally(graph, sb, graph->num_columns);
+ graph_pad_horizontally(graph, sb, chars_written);
/*
* Update graph->prev_state since we have output a padding line