diff options
| author | Allan Caffee <allan.caffee@gmail.com> | 2009-04-22 23:27:59 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-23 02:49:56 +0200 |
| commit | a6c1a3827c934872726bafb35f51f2ad9b9e897f (patch) | |
| tree | 3a0f601dcec66d00cbacfc1848b42ca75ad0c4be /graph.c | |
| parent | graph API: fix extra space during pre_commit_line state (diff) | |
| download | git-a6c1a3827c934872726bafb35f51f2ad9b9e897f.tar.xz git-a6c1a3827c934872726bafb35f51f2ad9b9e897f.zip | |
graph API: fix a bug in the rendering of octopus merges
An off by one error was causing octopus merges with 3 parents to not be
rendered correctly. This regression was introduced by 427fc5.
Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'graph.c')
| -rw-r--r-- | graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -852,7 +852,7 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb) graph_output_commit_char(graph, sb); chars_written++; - if (graph->num_parents > 3) + if (graph->num_parents > 2) chars_written += graph_draw_octopus_merge(graph, sb); } else if (seen_this && (graph->num_parents > 2)) { |