Code

Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Thu, 2 Sep 2010 16:08:15 +0000 (18:08 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:31:51 +0000 (09:31 -0700)
commit5e65ee35ddd306d6e6c86efc1c95315942f87811
treeb9c0e49fc33aa4a2c3bec127f4e752aa6fe1fc8a
parente294030fe89efcdd92430b60cf9568ffbe7317a8
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>
builtin/checkout.c
builtin/merge.c
unpack-trees.c
unpack-trees.h