From dc1166e685dc54946ea4600e962e56a965962ec2 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Thu, 2 Sep 2010 13:57:33 +0200 Subject: Move set_porcelain_error_msgs to unpack-trees.c and rename it The function is currently dealing only with error messages, but the intent of calling it is really to notify the unpack-tree mechanics that it is running in porcelain mode. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- unpack-trees.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'unpack-trees.h') diff --git a/unpack-trees.h b/unpack-trees.h index 6e049b099..d62bba9ba 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -22,6 +22,12 @@ enum unpack_trees_error_types { NB_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); + struct rejected_paths_list { char *path; struct rejected_paths_list *next; -- cgit v1.2.1