diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:47 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:47 +0900 |
commit | e60e38a15da202737790e2b2a9e613a9cf6ec092 (patch) | |
tree | c91ed7a45574e4c543814e52daf7f72871aa6f89 /commit.h | |
parent | Merge branch 'tg/range-diff-corner-case-fix' into maint (diff) | |
parent | commit-graph: close_commit_graph before shallow walk (diff) | |
download | tgif-e60e38a15da202737790e2b2a9e613a9cf6ec092.tar.xz |
Merge branch 'ds/commit-graph-with-grafts' into maint
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 'commit.h')
-rw-r--r-- | commit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -202,6 +202,7 @@ typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *); struct commit_graft *read_graft_line(struct strbuf *line); int register_commit_graft(struct repository *r, struct commit_graft *, int); +void prepare_commit_graft(struct repository *r); struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid); extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2); |