• M
    Move "show_all_errors = 1" to setup_unpack_trees_porcelain() · 5e65ee35
    Matthieu Moy 提交于
    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: NMatthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    5e65ee35
merge.c 33.8 KB