| commit | 08353ebbab2dfdee50a6daa616ec8b6483cb07c8 | |
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | |
| Wed, 11 Aug 2010 08:38:04 +0000 (11 10:38 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Aug 2010 17:36:00 +0000 (11 10:36 -0700) | ||
| tree | 57062a345dc79288eac8aa243ecbf16cd5d12d67 | treesnapshot (tar.gz zip) |
| parent | 64fdc08dac6694d1e754580e7acb82dfa4988bb9 | commitdiff |
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>
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>