diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-09-02 13:57:33 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:31:28 -0700 |
| commit | dc1166e685dc54946ea4600e962e56a965962ec2 (patch) | |
| tree | 32c6807e0344a44b108fa3382278af0f41b51ea7 /builtin/merge.c | |
| parent | t7609: test merge and checkout error messages (diff) | |
| download | tgif-dc1166e685dc54946ea4600e962e56a965962ec2.tar.xz | |
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/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
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++]) |