setup_unpack_trees_porcelain: take the whole options struct as parameter
This is a preparation patch to let setup_unpack_trees_porcelain set show_all_errors itself. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
dc1166e685
commit
e294030fe8
@ -373,7 +373,7 @@ static int merge_working_tree(struct checkout_opts *opts,
|
||||
topts.src_index = &the_index;
|
||||
topts.dst_index = &the_index;
|
||||
|
||||
setup_unpack_trees_porcelain(topts.msgs, "checkout");
|
||||
setup_unpack_trees_porcelain(&topts, "checkout");
|
||||
|
||||
refresh_cache(REFRESH_QUIET);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user