From e294030fe89efcdd92430b60cf9568ffbe7317a8 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Thu, 2 Sep 2010 13:57:34 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- unpack-trees.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'unpack-trees.c') 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"; -- cgit v1.2.1