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:
Matthieu Moy
2010-09-02 13:57:34 +02:00
committed by Junio C Hamano
parent dc1166e685
commit e294030fe8
5 changed files with 8 additions and 5 deletions

View File

@ -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";