On 7/9/2018 8:30 PM, Derrick Stolee wrote:
On 7/9/2018 6:27 PM, Junio C Hamano wrote:
Jonathan Tan <jonathantanmy@xxxxxxxxxx> writes:
This is on ds/commit-graph-fsck.
I saw that ds/commit-graph-fsck has been updated to the latest version
(v7, including "gc.writeCommitGraph"), so I've rebased my changes on
top
of that branch. There were some mechanical changes needed during the
rebase, so I'm sending the rebased patches out.
I've also added a patch (patch 1) that removes some duplication of
implementation that Junio talked about in [1].
[1]
https://public-inbox.org/git/xmqqefgtmrgi.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx/
While attempting to merge this topic to 'pu', I noticed that you and
Derrick are perhaps playing a game of whack-a-mole by you getting
rid of core_commit_graph global and making it a per in-core
repository instance, while Derrick adding core_multi_pack_index,
making it necessary for yet another round of similar clean-up?
We did have collisions with Jonathan's v1, but this v2 is on my latest
commit-graph things so should not have conflicts.
The core_commit_graph variable appears to still be global (do we have
config storage in the_repository yet?) so core_multi_pack_index is
similar.
I do put the multi_pack_index pointer inside the_repository->objects,
so the equivalent of this series will not be necessary for the MIDX
series.
This series looks good to me, so please add "Reviewed-by: Derrick
Stolee <dstolee@xxxxxxxxxxxxx>"
I think we are set for another series on top of this one that lets the
commit-graph feature handle arbitrary repositories (pass a 'struct
repository *r' in all of the functions).
Of course, after I send this message I see that my inbox had poorly
threaded this patch and item 6/6 was below these messages. Patch 6/6
does convert this variable and passes an arbitrary repository.
I'll update the MIDX patch in v4 to use that model for the config setting.