diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-09-02 18:08:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:31:51 -0700 |
| commit | 5e65ee35ddd306d6e6c86efc1c95315942f87811 (patch) | |
| tree | b9c0e49fc33aa4a2c3bec127f4e752aa6fe1fc8a /builtin/merge.c | |
| parent | e294030fe89efcdd92430b60cf9568ffbe7317a8 (diff) | |
| download | git-5e65ee35ddd306d6e6c86efc1c95315942f87811.tar.gz | |
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
Not only this makes the code clearer since setting up the porcelain error
message is meant to work with show_all_errors, but this fixes a call to
setup_unpack_trees_porcelain() in git_merge_trees() which did not set
show_all_errors.
add_rejected_path() used to double-check whether it was running in
plumbing mode. This check was ineffective since it was setting
show_all_errors too late for traverse_trees() to see it, and is made
useless by this patch. Remove it.
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index a25951475f..32b4d9d022 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -704,7 +704,6 @@ 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; setup_unpack_trees_porcelain(&opts, "merge"); trees[nr_trees] = parse_tree_indirect(head); |