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

graph: simplify graph_padding_line()

Browse Source 
Deduplicate code common to both branches of if statements.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2014-09-20 20:29:53 +02:00 committed by Junio C Hamano
parent 97b8860c07
commit 0176e7a71f
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
graph.c
View File

@ -1161,20 +1161,11 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
*/ */
for (i = 0; i < graph->num_columns; i++) { for (i = 0; i < graph->num_columns; i++) {
struct column *col = &graph->columns[i]; struct column *col = &graph->columns[i];
struct commit *col_commit = col->commit; strbuf_write_column(sb, col, '|');
if (col_commit == graph->commit) { if (col->commit == graph->commit && graph->num_parents > 2)
strbuf_write_column(sb, col, '|'); strbuf_addchars(sb, ' ', (graph->num_parents - 2) * 2);
else
if (graph->num_parents < 3)
strbuf_addch(sb, ' ');
else {
int num_spaces = ((graph->num_parents - 2) * 2);
strbuf_addchars(sb, ' ', num_spaces);
}
} else {
strbuf_write_column(sb, col, '|');
strbuf_addch(sb, ' '); strbuf_addch(sb, ' ');
}
} }
graph_pad_horizontally(graph, sb, graph->num_columns); graph_pad_horizontally(graph, sb, graph->num_columns);