diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:49 -0700 |
| commit | c208e05bd9880028c980fafbc5dda3d17a603ac1 (patch) | |
| tree | 25d587aacf885345b2b001bc006ac3871b5c7a4b /builtin/merge.c | |
| parent | f92d62ec4ead67109418483b65aaf158b7462121 (diff) | |
| parent | c5978a507ca20b12008724f78237784193fb9489 (diff) | |
| download | git-c208e05bd9880028c980fafbc5dda3d17a603ac1.tar.gz | |
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages:
t7609-merge-co-error-msgs: test non-fast forward case too.
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
setup_unpack_trees_porcelain: take the whole options struct as parameter
Move set_porcelain_error_msgs to unpack-trees.c and rename it
Conflicts:
merge-recursive.c
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 4e4ec898e6..5f65c0c8a6 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -718,8 +718,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.show_all_errors = 1; - set_porcelain_error_msgs(opts.msgs, "merge"); + setup_unpack_trees_porcelain(&opts, "merge"); trees[nr_trees] = parse_tree_indirect(head); if (!trees[nr_trees++]) |