Junio C Hamano <gits...@pobox.com> writes: > * ds/commit-graph-with-grafts (2018-07-19) 8 commits > (merged to 'next' on 2018-08-02 at 0ee624e329) > + commit-graph: close_commit_graph before shallow walk > + commit-graph: not compatible with uninitialized repo > + commit-graph: not compatible with grafts > + commit-graph: not compatible with replace objects > + test-repository: properly init repo > + commit-graph: update design document > + refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback > + refs.c: migrate internal ref iteration to pass thru repository argument > > The recently introduced commit-graph auxiliary data is incompatible > with mechanisms such as replace & grafts that "breaks" immutable > nature of the object reference relationship. Disable optimizations > based on its use (and updating existing commit-graph) when these > incompatible features are in use in the repository. > > Will merge to 'master'.
Derrick wrote that he will be sending v2 of this patch series in a few weeks, among others to make it use commit-graph feature if replace objects are present but not used (as some git hosting services do, see core.useReplaceRefs below). Also, the test for interaction of commit-graph with the grafts file feature does not actually test grafts, but replace objects. > * jk/core-use-replace-refs (2018-07-18) 3 commits > (merged to 'next' on 2018-08-02 at 90fb6b1056) > + add core.usereplacerefs config option > + check_replace_refs: rename to read_replace_refs > + check_replace_refs: fix outdated comment > > A new configuration variable core.usereplacerefs has been added, > primarily to help server installations that want to ignore the > replace mechanism altogether. > > Will merge to 'master'. Nice to have features used in the wild merged into core git. -- Jakub Narębski
