diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-08-11 08:38:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-11 17:36:00 (GMT) |
| commit | 08353ebbab2dfdee50a6daa616ec8b6483cb07c8 (patch) | |
| tree | 57062a345dc79288eac8aa243ecbf16cd5d12d67 /merge-recursive.h | |
| parent | 64fdc08dac6694d1e754580e7acb82dfa4988bb9 (diff) | |
| download | git-08353ebbab2dfdee50a6daa616ec8b6483cb07c8.zip git-08353ebbab2dfdee50a6daa616ec8b6483cb07c8.tar.gz git-08353ebbab2dfdee50a6daa616ec8b6483cb07c8.tar.bz2 | |
Turn unpack_trees_options.msgs into an array + enum
The list of error messages was introduced as a structure, but an array
indexed over an enum is more flexible, since it allows one to store a
type of error message (index in the array) in a variable.
This change needs to rename would_lose_untracked ->
would_lose_untracked_file to avoid a clash with the function
would_lose_untracked in merge-recursive.c.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index b831293..8412db8 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -23,8 +23,8 @@ struct merge_options { struct string_list current_directory_set; }; -/* Return a list of user-friendly error messages to be used by merge */ -struct unpack_trees_error_msgs get_porcelain_error_msgs(void); +/* Sets the list of user-friendly error messages to be used by merge */ +void set_porcelain_error_msgs(const char **msgs); /* merge_trees() but with recursive ancestor consolidation */ int merge_recursive(struct merge_options *o, |