Re: What's cooking in git.git (May 2018, #02; Thu, 17)

From: Derrick Stolee <stolee@gmail.com>
Date: May 17, 2018, 13:22 UTC
Message-ID: <759723ec-3f48-bdf6-2edd-6f69d1e7d12c@gmail.com>
In-Reply-To: <xmqqvabm6csb.fsf@gitster-ct.c.googlers.com>

On 5/17/2018 2:01 AM, Junio C Hamano wrote:

Show 20 quoted lines

> * ds/generation-numbers (2018-05-02) 11 commits
>   - commit-graph.txt: update design document
>   - merge: check config before loading commits
>   - commit: use generation number in remove_redundant()
>   - commit: add short-circuit to paint_down_to_common()
>   - commit: use generation numbers for in_merge_bases()
>   - ref-filter: use generation number for --contains
>   - commit-graph: always load commit-graph information
>   - commit: use generations in paint_down_to_common()
>   - commit-graph: compute generation numbers
>   - commit: add generation number to struct commmit
>   - ref-filter: fix outdated comment on in_commit_list
>   (this branch is used by ds/commit-graph-lockfile-fix; uses ds/lazy-load-trees.)
>
>   A recently added "commit-graph" datafile has learned to store
>   pre-computed generation numbers to speed up the decisions to stop
>   history traversal.
>
>   Is this ready for 'next' with ds/commit-graph-lockfile-fix?
>   A commit with triple 'm' needs its title amended, though.

With the lockfile fix, it should be ready. I've been giving this significant testing on my machine and a few other developers here. The next version of GVFS is shipping with this code and with GVFS controlling the maintenance of the commit-graph file. That code has been cooking with our CI builds for a while, with full functional tests against the Windows repository. The only bugs we've found are the fix in "merge: check config before loading commits" and in ds/commit-graph-lockfile-fix.

Sorry for the triple-m.

Thanks, -Stolee