undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/graph-padding-fix'

Browse Source 
The "graph" API used in "git log --graph" miscounted the number of
output columns consumed so far when drawing a padding line, which
has been fixed; this did not affect any existing code as nobody
tried to write anything after the padding on such a line, though.

* jk/graph-padding-fix:
  graph: fix extra spaces in graph_padding_line
This commit is contained in:
Junio C Hamano 2016-10-06 14:53:11 -07:00
commit cb52426d9a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
graph.c
View File

@ -1175,6 +1175,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);
@ -1190,14 +1191,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