• M
    unpack_trees: group error messages by type · e6c111b4
    Matthieu Moy 提交于
    When an error is encountered, it calls add_rejected_file() which either
    - directly displays the error message and stops if in plumbing mode
      (i.e. if show_all_errors is not initialized at 1)
    - or stores it so that it will be displayed at the end with display_error_msgs(),
    
    Storing the files by error type permits to have a list of files for
    which there is the same error instead of having a serie of almost
    identical errors.
    
    As each bind_overlap error combines a file and an old file, a list cannot be
    done, therefore, theses errors are not stored but directly displayed.
    Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    e6c111b4
merge.c 33.8 KB