Move set_porcelain_error_msgs to unpack-trees.c and rename it

[git.git] / builtin / checkout.c

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 894bb84db515b1b371cf356785dd1807ed1ec5ab..00cd1645cfe291b53cb1206a8a74570a976bce07 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -373,7 +373,7 @@ static int merge_working_tree(struct checkout_opts *opts,
                topts.src_index = &the_index;
                topts.dst_index = &the_index;
 
-               set_porcelain_error_msgs(topts.msgs, "checkout");
+               setup_unpack_trees_porcelain(topts.msgs, "checkout");
 
                refresh_cache(REFRESH_QUIET);