Re: [PATCH 1/1] commit-graph: fix bug around octopus merges

2019-08-06 Thread SZEDER Gábor
On Tue, Aug 06, 2019 at 08:03:07AM -0400, Derrick Stolee wrote: > > On the other hand, one of my fun side-projects is to run some > > semi-automated and souped-up CI builds of currently cooking topics, > > which include a custom GETTEXT_POISON mode [1], where the poisoned > > translated progress ou

Re: [PATCH 1/1] commit-graph: fix bug around octopus merges

2019-08-06 Thread Derrick Stolee
On 8/6/2019 5:21 AM, SZEDER Gábor wrote: > On Mon, Aug 05, 2019 at 09:43:41AM -0700, Derrick Stolee via GitGitGadget > wrote: > >> In such a case, the reading >> process outputs the following message to stderr: >> >> warning: commit-graph chain does not match >> >> These warnings are output

Re: [PATCH 1/1] commit-graph: fix bug around octopus merges

2019-08-06 Thread SZEDER Gábor
On Mon, Aug 05, 2019 at 09:43:41AM -0700, Derrick Stolee via GitGitGadget wrote: > In such a case, the reading > process outputs the following message to stderr: > > warning: commit-graph chain does not match > > These warnings are output in the test suite, but ignored. By > checking the s

[PATCH 1/1] commit-graph: fix bug around octopus merges

2019-08-05 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee In 1771be90 "commit-graph: merge commit-graph chains" (2019-06-18), the method sort_and_scan_merged_commits() was added to merge the commit lists of two commit-graph files in the incremental format. Unfortunately, there was an off-by-one error in that method around incrementi