diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:22 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:23 +0300 |
commit | 7589e63648bf5224e186990931b1491f36e10a4b (patch) | |
tree | dfd3004e735b69ae91dc08ac4f742f1cb84eae5d /merge-recursive.h | |
parent | e52c6bbd131f1f4f17b95e28d12ead0c81a8e890 (diff) | |
parent | f8adbec9feaa7a1ab9814db1115826e87033712e (diff) |
Merge branch 'nd/the-index-final'
The assumption to work on the single "in-core index" instance has
been reduced from the library-ish part of the codebase.
* nd/the-index-final:
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
read-cache.c: remove the_* from index_has_changes()
merge-recursive.c: remove implicit dependency on the_repository
merge-recursive.c: remove implicit dependency on the_index
sha1-name.c: remove implicit dependency on the_index
read-cache.c: replace update_index_if_able with repo_&
read-cache.c: kill read_index()
checkout: avoid the_index when possible
repository.c: replace hold_locked_index() with repo_hold_locked_index()
notes-utils.c: remove the_repository references
grep: use grep_opt->repo instead of explict repo argument
Diffstat (limited to 'merge-recursive.h')
-rw-r--r-- | merge-recursive.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index e6a0828eca..c2b7bb65c6 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -6,6 +6,8 @@ struct commit; +struct repository; + struct merge_options { const char *ancestor; const char *branch1; @@ -34,6 +36,7 @@ struct merge_options { struct string_list df_conflict_file_set; struct unpack_trees_options unpack_opts; struct index_state orig_index; + struct repository *repo; }; /* @@ -92,7 +95,8 @@ int merge_recursive_generic(struct merge_options *o, const struct object_id **ca, struct commit **result); -void init_merge_options(struct merge_options *o); +void init_merge_options(struct merge_options *o, + struct repository *repo); struct tree *write_tree_from_memory(struct merge_options *o); int parse_merge_opt(struct merge_options *out, const char *s); |