On Thu, Oct 10, 2019 at 11:16:24AM -0700, Denton Liu wrote: > > test_expect_success 'log --graph with normal octopus merge, no color' ' > > So, I decided to merge 'dl/octopus-graph-bug' with your branch and I > couldn't be happier! I had to make a couple of minor tweaks to the > existing test cases but most of them only involved flipping > `test_expect_failure` to `test_expect_success`. Thanks for doing that. I also checked the output on the git.git case discussed in: https://public-inbox.org/git/20190926202326.GA16664@xxxxxxxxxxxxxxxxxxxxx/ and it looks great. Probably because it's the same as your test cases -- the "non-collapsing type" I called it there (or maybe it's all just the out-of-order thing James brought up; I don't recall discussing that before, but certainly his test case exhibits the same off-by-one coloring weirdness without the code change). -Peff