setup_unpack_trees_porcelain: take the whole options struct as parameter

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 697d948e85a9d3c07824603f838bf7655f36a908..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;
-       set_porcelain_error_msgs(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);
@@ -1178,37 +1178,6 @@ static int process_entry(struct merge_options *o,
        return clean_merge;
 }
 
-void set_porcelain_error_msgs(const char **msgs, const char *cmd)
-{
-       const char *msg;
-       char *tmp;
-       const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
-       if (advice_commit_before_merge)
-               msg = "Your local changes to '%%s' would be overwritten by %s.  Aborting.\n"
-                       "Please, commit your changes or stash them before you can %s.";
-       else
-               msg = "Your local changes to '%%s' would be overwritten by %s.  Aborting.";
-       tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 3);
-       sprintf(tmp, msg, cmd, cmd2);
-       msgs[ERROR_WOULD_OVERWRITE] = tmp;
-       msgs[ERROR_NOT_UPTODATE_FILE] = tmp;
-
-       msgs[ERROR_NOT_UPTODATE_DIR] =
-               "Updating '%s' would lose untracked files in it.  Aborting.";
-
-       if (advice_commit_before_merge)
-               msg = "Untracked working tree file '%%s' would be %s by %s.  Aborting"
-                       "Please move or remove them before you can %s.";
-       else
-               msg = "Untracked working tree file '%%s' would be %s by %s.  Aborting";
-       tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("removed") + strlen(cmd2) - 4);
-       sprintf(tmp, msg, "removed", cmd, cmd2);
-       msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = tmp;
-       tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("overwritten") + strlen(cmd2) - 4);
-       sprintf(tmp, msg, "overwritten", cmd, cmd2);
-       msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = tmp;
-}
-
 int merge_trees(struct merge_options *o,
                struct tree *head,
                struct tree *merge,