diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:15:59 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 16:15:59 +0900 |
| commit | 6d8f8ebb74d21b51cfbf427a436094134af36ee2 (patch) | |
| tree | 0b50647db06413e2f43487b2bfca167105b7f701 /replace-object.h | |
| parent | 36d767d02e12c1ff991511b7bd8c1d023340f2ca (diff) | |
| parent | 829a321569d8e8f2c582aef9f0c990df976ab842 (diff) | |
| download | git-6d8f8ebb74d21b51cfbf427a436094134af36ee2.tar.gz | |
Merge branch 'ds/commit-graph-with-grafts'
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.
* ds/commit-graph-with-grafts:
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
Diffstat (limited to 'replace-object.h')
| -rw-r--r-- | replace-object.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/replace-object.h b/replace-object.h index 9345e105dd..16528df942 100644 --- a/replace-object.h +++ b/replace-object.h @@ -10,6 +10,8 @@ struct replace_object { struct object_id replacement; }; +void prepare_replace_object(struct repository *r); + /* * This internal function is only declared here for the benefit of * lookup_replace_object(). Please do not call it directly. |
