merge.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>
This commit is contained in:

committed by
Junio C Hamano

parent
f4a55b2797
commit
7e196c3a28
20
merge.c
20
merge.c
@ -14,7 +14,8 @@ static const char *merge_argument(struct commit *commit)
|
||||
return oid_to_hex(commit ? &commit->object.oid : the_hash_algo->empty_tree);
|
||||
}
|
||||
|
||||
int try_merge_command(const char *strategy, size_t xopts_nr,
|
||||
int try_merge_command(struct repository *r,
|
||||
const char *strategy, size_t xopts_nr,
|
||||
const char **xopts, struct commit_list *common,
|
||||
const char *head_arg, struct commit_list *remotes)
|
||||
{
|
||||
@ -35,15 +36,16 @@ int try_merge_command(const char *strategy, size_t xopts_nr,
|
||||
ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
|
||||
argv_array_clear(&args);
|
||||
|
||||
discard_cache();
|
||||
if (read_cache() < 0)
|
||||
discard_index(r->index);
|
||||
if (read_index(r->index) < 0)
|
||||
die(_("failed to read the cache"));
|
||||
resolve_undo_clear();
|
||||
resolve_undo_clear_index(r->index);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int checkout_fast_forward(const struct object_id *head,
|
||||
int checkout_fast_forward(struct repository *r,
|
||||
const struct object_id *head,
|
||||
const struct object_id *remote,
|
||||
int overwrite_ignore)
|
||||
{
|
||||
@ -54,7 +56,7 @@ int checkout_fast_forward(const struct object_id *head,
|
||||
struct dir_struct dir;
|
||||
struct lock_file lock_file = LOCK_INIT;
|
||||
|
||||
refresh_cache(REFRESH_QUIET);
|
||||
refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
|
||||
|
||||
if (hold_locked_index(&lock_file, LOCK_REPORT_ON_ERROR) < 0)
|
||||
return -1;
|
||||
@ -86,8 +88,8 @@ int checkout_fast_forward(const struct object_id *head,
|
||||
}
|
||||
|
||||
opts.head_idx = 1;
|
||||
opts.src_index = &the_index;
|
||||
opts.dst_index = &the_index;
|
||||
opts.src_index = r->index;
|
||||
opts.dst_index = r->index;
|
||||
opts.update = 1;
|
||||
opts.verbose_update = 1;
|
||||
opts.merge = 1;
|
||||
@ -101,7 +103,7 @@ int checkout_fast_forward(const struct object_id *head,
|
||||
}
|
||||
clear_unpack_trees_porcelain(&opts);
|
||||
|
||||
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
|
||||
if (write_locked_index(r->index, &lock_file, COMMIT_LOCK))
|
||||
return error(_("unable to write new index file"));
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user