From 5e65ee35ddd306d6e6c86efc1c95315942f87811 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Thu, 2 Sep 2010 18:08:15 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- unpack-trees.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unpack-trees.h') diff --git a/unpack-trees.h b/unpack-trees.h index fad680dce..7c0187d11 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -24,7 +24,7 @@ enum unpack_trees_error_types { /* * Sets the list of user-friendly error messages to be used by the - * command "cmd" (either merge or checkout) + * command "cmd" (either merge or checkout), and show_all_errors to 1. */ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, const char *cmd); -- cgit v1.2.1