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.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'unpack-trees.c') diff --git a/unpack-trees.c b/unpack-trees.c index 8bf8ce8805..d0c5d1c4d5 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -94,6 +94,8 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, "The following Working tree files would be overwritten by sparse checkout update:\n%s"; msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = "The following Working tree files would be removed by sparse checkout update:\n%s"; + + opts->show_all_errors = 1; } static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce, @@ -120,12 +122,6 @@ static int add_rejected_path(struct unpack_trees_options *o, const char *path) { struct rejected_paths_list *newentry; - int porcelain = o && (o)->msgs[e]; - /* - * simply display the given error message if in plumbing mode - */ - if (!porcelain) - o->show_all_errors = 0; if (!o->show_all_errors) return error(ERRORMSG(o, e), path); -- cgit v1.2.1