diff options
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 7267ae7c632..8bf8ce8805f 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"; |