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>

diff --git a/graph.c b/graph.c
index dfb99f6436b41f5a567bc7c7a5785588bef15b41..52605e4f6bc4e3b420e5fd45fefd7bf901022435 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -1161,20 +1161,11 @@ 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];
         */
        for (i = 0; i < graph->num_columns; i++) {
                struct column *col = &graph->columns[i];

-               struct commit *col_commit = col->commit;
-               if (col_commit == graph->commit) {
-                       strbuf_write_column(sb, col, '|');
-
-                       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_write_column(sb, col, '|');
+               if (col->commit == graph->commit && graph->num_parents > 2)
+                       strbuf_addchars(sb, ' ', (graph->num_parents - 2) * 2);
+               else

                        strbuf_addch(sb, ' ');
                        strbuf_addch(sb, ' ');

-               }

        }
 
        graph_pad_horizontally(graph, sb, graph->num_columns);
        }
 
        graph_pad_horizontally(graph, sb, graph->num_columns);