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>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 00cd1645cfe291b53cb1206a8a74570a976bce07..f6caac104750a154d8934d570b3e099c2f5f27fc 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;
 
                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);
 
 
                refresh_cache(REFRESH_QUIET);
 

diff --git a/builtin/merge.c b/builtin/merge.c
index 20a28b21809f1882cee57e0d9c50666115ec10dd..a25951475f08a5a32194bf1e5236d84e7dee91d0 100644 (file)
--- 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;
        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++])
 
        trees[nr_trees] = parse_tree_indirect(head);
        if (!trees[nr_trees++])

diff --git a/merge-recursive.c b/merge-recursive.c
index 85f339ef7ae9ccec2c4de6ad1480ba7df2969dd1..084f54b88c92c2edb48a5aaab2004ed3840d573e 100644 (file)
--- 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;
        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);
 
        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 7267ae7c632b075d263c06d837af7b0b3629456b..8bf8ce8805f3d320d285afccdfd6f9893d3e9e81 100644 (file)
--- 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)]) )
 
          ? ((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";
        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 d62bba9baa70822ef2079781faafd1596f41e2b6..fad680dced188594fec356a20679be07842110d3 100644 (file)
--- 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)
  */
  * 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;
 
 struct rejected_paths_list {
        char *path;