Junio C Hamano <gitster@xxxxxxxxx> writes: > 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? Ineffective, yes. <disgression> I should have listened better during my english courses ;-). Both words translate to "inefficace" in French, and it's a common mistake for french people. </disgression> -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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