From: Allan Caffee <allan.caffee@gmail.com>
To: git@vger.kernel.org
Cc: Teemu Likonen <tlikonen@iki.fi>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 3/3] graph API: fix a bug in the rendering of octopus merges
Date: Wed, 22 Apr 2009 17:27:59 -0400 [thread overview]
Message-ID: <20090422212759.GA30512@linux.vnet> (raw)
In-Reply-To: <20090422193838.GA1841@linux.vnet>
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>
---
graph.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/graph.c b/graph.c
index 31e09eb..b7879f8 100644
--- a/graph.c
+++ b/graph.c
@@ -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)) {
--
1.5.6.3
next prev parent reply other threads:[~2009-04-22 21:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-21 0:40 [RFC/PATCH] graph API: Use horizontal lines for more compact graphs Allan Caffee
2009-04-21 0:56 ` Johannes Schindelin
2009-04-21 2:23 ` Allan Caffee
2009-04-21 8:13 ` Johannes Schindelin
2009-04-21 12:47 ` [RFC/PATCH v2] " Allan Caffee
2009-04-21 13:17 ` Johannes Schindelin
2009-04-21 13:36 ` Bug in colored "log --graph" implementation Teemu Likonen
2009-04-21 18:34 ` [PATCH] graph API: fix extra space during pre_commit_line state Allan Caffee
2009-04-22 3:25 ` Teemu Likonen
2009-04-22 19:38 ` Allan Caffee
2009-04-22 19:52 ` [PATCH 2/3] " Allan Caffee
2009-04-22 21:27 ` [PATCH 1/3] t4202-log: extend test coverage of graphing Allan Caffee
2009-04-22 21:27 ` [PATCH 2/3] graph API: fix extra space during pre_commit_line state Allan Caffee
2009-04-22 21:27 ` Allan Caffee [this message]
2009-04-22 21:28 ` [RFC/PATCH v2] graph API: Use horizontal lines for more compact graphs Allan Caffee
2009-04-27 15:43 ` [PATCH v2 (resend)] " Allan Caffee
2009-04-27 16:35 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090422212759.GA30512@linux.vnet \
--to=allan.caffee@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tlikonen@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).