summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-08-11 08:38:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-11 17:36:00 (GMT)
commit08353ebbab2dfdee50a6daa616ec8b6483cb07c8 (patch)
tree57062a345dc79288eac8aa243ecbf16cd5d12d67 /builtin/checkout.c
parent64fdc08dac6694d1e754580e7acb82dfa4988bb9 (diff)
downloadgit-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 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 1994be9..7d1706e 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -373,7 +373,7 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.src_index = &the_index;
topts.dst_index = &the_index;
- topts.msgs.not_uptodate_file = "You have local changes to '%s'; cannot switch branches.";
+ topts.msgs[ERROR_NOT_UPTODATE_FILE] = "You have local changes to '%s'; cannot switch branches.";
refresh_cache(REFRESH_QUIET);