diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-09-02 13:57:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:31:41 -0700 |
| commit | e294030fe89efcdd92430b60cf9568ffbe7317a8 (patch) | |
| tree | 574bbe6ed9e41ae61f130ba476f24da6b3847415 /unpack-trees.h | |
| parent | dc1166e685dc54946ea4600e962e56a965962ec2 (diff) | |
| download | git-e294030fe89efcdd92430b60cf9568ffbe7317a8.tar.gz git-e294030fe89efcdd92430b60cf9568ffbe7317a8.tar.xz | |
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>
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index d62bba9ba..fad680dce 100644 --- 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) */ -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; |