From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 02 Sep 2010 15:52:24 GMT
Subject: Re: [PATCH 3/3] Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
Message-ID: <7v8w3k2ldz.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1283428655-12680-4-git-send-email-Matthieu.Moy@imag.fr>

Matthieu Moy <Matthieu.Moy@imag.fr> writes:

> 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 inefficient since it was setting
> show_all_errors too late for traverse_trees() to see it, and is made
> useless by this patch. Remove it.

Do you mean inefficient or ineffective?

The code in this patch looks fine, though.

Thanks.