mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive.c: remove implicit dependency on the_index

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2019-01-12 09:13:29 +07:00
committed by Junio C Hamano
parent 3a7a698e93
commit 0d6caa2d08
7 changed files with 91 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
merge-recursive.h
View File

@ -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);