diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-08-11 10:38:04 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-11 10:36:00 -0700 |
| commit | 08353ebbab2dfdee50a6daa616ec8b6483cb07c8 (patch) | |
| tree | 57062a345dc79288eac8aa243ecbf16cd5d12d67 /builtin | |
| parent | Git 1.7.2 (diff) | |
| download | tgif-08353ebbab2dfdee50a6daa616ec8b6483cb07c8.tar.xz | |
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')
| -rw-r--r-- | builtin/checkout.c | 2 | ||||
| -rw-r--r-- | builtin/merge.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 1994be92c6..7d1706e0f9 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); diff --git a/builtin/merge.c b/builtin/merge.c index 37ce4f589f..115a28854d 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -704,7 +704,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote opts.verbose_update = 1; opts.merge = 1; opts.fn = twoway_merge; - opts.msgs = get_porcelain_error_msgs(); + set_porcelain_error_msgs(opts.msgs); trees[nr_trees] = parse_tree_indirect(head); if (!trees[nr_trees++]) |