diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-09-02 15:57:33 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 20:31:28 +0400 |
| commit | dc1166e685dc54946ea4600e962e56a965962ec2 (patch) | |
| tree | 32c6807e0344a44b108fa3382278af0f41b51ea7 /builtin | |
| parent | e935e62a0fd26ff1f29a98a4ca8fa693f42357a2 (diff) | |
Move set_porcelain_error_msgs to unpack-trees.c and rename it
The function is currently dealing only with error messages, but the
intent of calling it is really to notify the unpack-tree mechanics that
it is running in porcelain mode.
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 894bb84db5..00cd1645cf 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; - set_porcelain_error_msgs(topts.msgs, "checkout"); + setup_unpack_trees_porcelain(topts.msgs, "checkout"); refresh_cache(REFRESH_QUIET); diff --git a/builtin/merge.c b/builtin/merge.c index 1bcf7fd9d5..20a28b2180 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -705,7 +705,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote opts.merge = 1; opts.fn = twoway_merge; opts.show_all_errors = 1; - set_porcelain_error_msgs(opts.msgs, "merge"); + setup_unpack_trees_porcelain(opts.msgs, "merge"); trees[nr_trees] = parse_tree_indirect(head); if (!trees[nr_trees++]) |