Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Simpkins <adam@adamsimpkins.net>2008-05-24 06:24:10 +0400
committerJunio C Hamano <gitster@pobox.com>2008-05-25 22:42:44 +0400
commit2ecbd0a0db0f9d59a5df02a6daeb87e611171fa4 (patch)
treef8fba15e4ab099f8b02b1925fd98240950f8db5e
parent182fb4df9120257c2e6b041dd58eef3de5b530d2 (diff)
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>
-rw-r--r--graph.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/graph.c b/graph.c
index 9d6ed30b0b..400f0147bf 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