From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Allan Caffee <allan.caffee@gmail.com>,
Noam Postavsky <npostavs@users.sourceforge.net>
Subject: Re: [BUG/PATCH 0/5] t4214: cleanup and demonstrate graph bug
Date: Wed, 25 Sep 2019 10:09:02 -0700 [thread overview]
Message-ID: <20190925170902.GA11547@dentonliu-ltm.internal.salesforce.com> (raw)
In-Reply-To: <cover.1569407150.git.liu.denton@gmail.com>
On Wed, Sep 25, 2019 at 03:26:57AM -0700, Denton Liu wrote:
> I tried my hand at fixing the bug but in the hour I spent going at it, I
> couldn't fix the logic up. The buggy logic is in graph.c:
> graph_draw_octopus_merge() in case anyone is interested.
I guess for the record, this was the final patch that I ended up with.
Two issues with it, though:
1. It assumes that there can be no parallel paths on the right side,
which I'm not sure is a correct assumption.
2. It _still_ fails my last proposed test case.
-- >8 --
diff --git a/graph.c b/graph.c
index f53135485f..f9395a2327 100644
--- a/graph.c
+++ b/graph.c
@@ -881,8 +881,7 @@ static int graph_draw_octopus_merge(struct git_graph *graph,
/*
* In both cases, commit_index corresponds to the edge labeled "0".
*/
- int first_col = graph->commit_index + dashless_parents
- - parent_in_old_cols;
+ int first_col = graph->num_new_columns - dashful_parents;
int i;
for (i = 0; i < dashful_parents; i++) {
next prev parent reply other threads:[~2019-09-25 17:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 10:26 [BUG/PATCH 0/5] t4214: cleanup and demonstrate graph bug Denton Liu
2019-09-25 10:27 ` [BUG/PATCH 1/5] test-lib: let test_merge() perform octopus merges Denton Liu
2019-09-25 10:27 ` [BUG/PATCH 2/5] t4214: use test_merge Denton Liu
2019-09-25 10:27 ` [BUG/PATCH 3/5] t4214: generate expect in their own test cases Denton Liu
2019-09-25 10:27 ` [BUG/PATCH 4/5] t4214: explicitly list tags in log Denton Liu
2019-09-25 10:27 ` [BUG/PATCH 5/5] t4214: demonstrate octopus graph coloring failure Denton Liu
2019-09-25 17:09 ` Denton Liu [this message]
2019-09-26 20:23 ` [BUG/PATCH 0/5] t4214: cleanup and demonstrate graph bug Jeff King
2019-10-03 22:16 ` Junio C Hamano
2019-10-04 0:23 ` [PATCH v2 " Denton Liu
2019-10-04 0:23 ` [PATCH v2 1/5] test-lib: let test_merge() perform octopus merges Denton Liu
2019-10-04 0:23 ` [PATCH v2 2/5] t4214: use test_merge Denton Liu
2019-10-04 0:23 ` [PATCH v2 3/5] t4214: generate expect in their own test cases Denton Liu
2019-10-04 0:23 ` [PATCH v2 4/5] t4214: explicitly list tags in log Denton Liu
2019-10-04 0:23 ` [PATCH v2 5/5] t4214: demonstrate octopus graph coloring failure Denton Liu
2019-10-04 5:50 ` [PATCH v2 0/5] t4214: cleanup and demonstrate graph bug 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190925170902.GA11547@dentonliu-ltm.internal.salesforce.com \
--to=liu.denton@gmail.com \
--cc=allan.caffee@gmail.com \
--cc=git@vger.kernel.org \
--cc=npostavs@users.sourceforge.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).