graph: simplify graph_padding_line()
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>
René Scharfe committed
Sep 20, 2014 at 20:29 UTC
0176e7a71f2c722effde0ed22db3682400010911
1 file changed
+4
-13
graph.c
+4
-13
@@ -1161,20 +1161,11 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
1161
*/
1162
for (i = 0; i < graph->num_columns; i++) {
1163
struct column *col = &graph->columns[i];
1164
- struct commit *col_commit = col->commit;
1165
- if (col_commit == graph->commit) {
1166
- strbuf_write_column(sb, col, '|');
1167
-
1168
- if (graph->num_parents < 3)
1169
- strbuf_addch(sb, ' ');
1170
- else {
1171
- int num_spaces = ((graph->num_parents - 2) * 2);
1172
- strbuf_addchars(sb, ' ', num_spaces);
1173
- }
1174
- } else {
1175
- strbuf_write_column(sb, col, '|');
1164
+ strbuf_write_column(sb, col, '|');
1165
+ if (col->commit == graph->commit && graph->num_parents > 2)
1166
+ strbuf_addchars(sb, ' ', (graph->num_parents - 2) * 2);
1167
+ else
1168
strbuf_addch(sb, ' ');
1177
- }
1169
}
1170
1171
graph_pad_horizontally(graph, sb, graph->num_columns);