Re: [PATCH v2 1/2] commit-graph write: add progress output

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 21, 2018, 21:57 UTC
Message-ID: <xmqqy3butsxn.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <xmqq36u2v85q.fsf@gitster-ct.c.googlers.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 10 quoted lines

>> The above prototype change seems to have created a semantic conflict
>> with ds/commit-graph-tests (859fdc "commit-graph: define
>> GIT_TEST_COMMIT_GRAPH") because when GIT_TEST_COMMIT_GRAPH is set, we
>> call write_commit_graph_reachable() but the final parameter was
>> resolved to be "1" instead of "0".
>
> Hmph.  That's unfortunate.
>
> Perhaps one of the topics should have yielded and waited until the
> other one passes through.

Nah, I see where things went wrong. I'll queue a single-liner "mismerge fix" to 'next', and then correct the seed for the evil merge kept in merge-fix/ab/commit-graph-progress, and rebuild 'pu'. Things will straighten out by themselves after that happens.

Thanks for noticing.