Matthieu Moy <Matthieu.Moy@xxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html