diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 02:13:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 20:13:04 (GMT) |
| commit | 0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763 (patch) | |
| tree | c1c4b356f5b889b13c436bb4b6a6adb301c587f1 /merge-recursive.h | |
| parent | 3a7a698e93e1031c322ab20c0e336e205514c058 (diff) | |
| download | git-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.zip git-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.tar.gz git-0d6caa2d08e39bf97e0cffb8ba2b4d39a73bf763.tar.bz2 | |
merge-recursive.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 e6a0828..c2b7bb6 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); |