diff options
| -rw-r--r-- | builtin/checkout.c | 2 | ||||
| -rw-r--r-- | builtin/merge.c | 2 | ||||
| -rw-r--r-- | merge-recursive.c | 2 | ||||
| -rw-r--r-- | unpack-trees.c | 4 | ||||
| -rw-r--r-- | unpack-trees.h | 3 |
5 files changed, 8 insertions, 5 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 00cd1645cf..f6caac1047 100644 --- 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; - setup_unpack_trees_porcelain(topts.msgs, "checkout"); + setup_unpack_trees_porcelain(&topts, "checkout"); refresh_cache(REFRESH_QUIET); diff --git a/builtin/merge.c b/builtin/merge.c index 20a28b2180..a25951475f 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -705,7 +705,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote opts.merge = 1; opts.fn = twoway_merge; opts.show_all_errors = 1; - setup_unpack_trees_porcelain(opts.msgs, "merge"); + setup_unpack_trees_porcelain(&opts, "merge"); trees[nr_trees] = parse_tree_indirect(head); if (!trees[nr_trees++]) diff --git a/merge-recursive.c b/merge-recursive.c index 85f339ef7a..084f54b88c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -185,7 +185,7 @@ static int git_merge_trees(int index_only, opts.fn = threeway_merge; opts.src_index = &the_index; opts.dst_index = &the_index; - setup_unpack_trees_porcelain(opts.msgs, "merge"); + setup_unpack_trees_porcelain(&opts, "merge"); init_tree_desc_from_tree(t+0, common); init_tree_desc_from_tree(t+1, head); diff --git a/unpack-trees.c b/unpack-trees.c index 7267ae7c63..8bf8ce8805 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -50,8 +50,10 @@ const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { ? ((o)->msgs[(type)]) \ : (unpack_plumbing_errors[(type)]) ) -void setup_unpack_trees_porcelain(const char **msgs, const char *cmd) +void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, + const char *cmd) { + const char **msgs = opts->msgs; const char *msg; char *tmp; const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches"; diff --git a/unpack-trees.h b/unpack-trees.h index d62bba9baa..fad680dced 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -26,7 +26,8 @@ enum unpack_trees_error_types { * Sets the list of user-friendly error messages to be used by the * command "cmd" (either merge or checkout) */ -void setup_unpack_trees_porcelain(const char **msgs, const char *cmd); +void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, + const char *cmd); struct rejected_paths_list { char *path; |