diff options
author | 2018-11-21 22:57:47 +0900 | |
---|---|---|
committer | 2018-11-21 22:57:47 +0900 | |
commit | e60e38a15da202737790e2b2a9e613a9cf6ec092 (patch) | |
tree | c91ed7a45574e4c543814e52daf7f72871aa6f89 /refs/refs-internal.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 'refs/refs-internal.h')
-rw-r--r-- | refs/refs-internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/refs/refs-internal.h b/refs/refs-internal.h index 04425d6d1e..89d7dd49cd 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -474,8 +474,9 @@ extern struct ref_iterator *current_ref_iter; * adapter between the callback style of reference iteration and the * iterator style. */ -int do_for_each_ref_iterator(struct ref_iterator *iter, - each_ref_fn fn, void *cb_data); +int do_for_each_repo_ref_iterator(struct repository *r, + struct ref_iterator *iter, + each_repo_ref_fn fn, void *cb_data); /* * Only include per-worktree refs in a do_for_each_ref*() iteration. |