unpack_trees: group error messages by type
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Wed, 11 Aug 2010 08:38:07 +0000 (10:38 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2010 17:36:06 +0000 (10:36 -0700)
commite6c111b4c092c0dd24c541b9721f5bc04641dcb0
tree55fd6f65b2479bba7d15dece5fad53a451b6369d
parent08402b0409bc501deb97cf4388a78ee9f87092c6
unpack_trees: group error messages by type

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: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/technical/api-tree-walking.txt
builtin/checkout.c
builtin/merge.c
merge-recursive.c
t/t3030-merge-recursive.sh
t/t3400-rebase.sh
t/t3404-rebase-interactive.sh
tree-walk.c
tree-walk.h
unpack-trees.c
unpack-trees.h