diff options
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 6e049b0997..cd11a08365 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -1,6 +1,8 @@ #ifndef UNPACK_TREES_H #define UNPACK_TREES_H +#include "string-list.h" + #define MAX_UNPACK_TREES 8 struct unpack_trees_options; @@ -22,10 +24,12 @@ enum unpack_trees_error_types { NB_UNPACK_TREES_ERROR_TYPES }; -struct rejected_paths_list { - char *path; - struct rejected_paths_list *next; -}; +/* + * Sets the list of user-friendly error messages to be used by the + * command "cmd" (either merge or checkout), and show_all_errors to 1. + */ +void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, + const char *cmd); struct unpack_trees_options { unsigned int reset, @@ -52,7 +56,7 @@ struct unpack_trees_options { * Store error messages in an array, each case * corresponding to a error message type */ - struct rejected_paths_list *unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES]; + struct string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES]; int head_idx; int merge_size; |