From: Adam Simpkins <adam@adamsimpkins.net>
Date: Sat, 24 May 2008 02:24:10 +0000 (-0700)
Subject: graph API: fix graph mis-alignment after uninteresting commits
X-Git-Tag: v1.5.6-rc0~1^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2ecbd0a0db0f9d59a5df02a6daeb87e611171fa4;p=git.git

graph API: fix graph mis-alignment after uninteresting commits

The graphing code had a bug that caused it to output branch lines
incorrectly after ignoring an uninteresting commit.  When computing how
to match up the branch lines from the current commit to the next one, it
forgot to take into account that it needed to initially start with 2
empty spaces where the missing commit would have gone.

So, instead of drawing this,

  | * | <- Commit with uninteresting parent
  |  /
  * |

It used to incorrectly draw this:

  | * | <- Commit with uninteresting parent
  * |

Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/graph.c b/graph.c
index 9d6ed30b0..400f0147b 100644
--- a/graph.c
+++ b/graph.c
@@ -190,7 +190,10 @@ static void graph_insert_into_new_columns(struct git_graph *graph,
 	 * Ignore uinteresting and pruned commits
 	 */
 	if (commit->object.flags & (UNINTERESTING | TREESAME))
+	{
+		*mapping_index += 2;
 		return;
+	}
 
 	/*
 	 * If the commit is already in the new_columns list, we don't need to