diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-08-11 12:38:07 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-11 21:36:06 +0400 |
| commit | e6c111b4c092c0dd24c541b9721f5bc04641dcb0 (patch) | |
| tree | 55fd6f65b2479bba7d15dece5fad53a451b6369d /t/t3030-merge-recursive.sh | |
| parent | 08402b0409bc501deb97cf4388a78ee9f87092c6 (diff) | |
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>
Diffstat (limited to 't/t3030-merge-recursive.sh')
| -rwxr-xr-x | t/t3030-merge-recursive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index d541544537..efe2900a37 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -294,7 +294,7 @@ test_expect_success 'fail if the index has unresolved entries' ' grep "You have not concluded your merge" out && rm -f .git/MERGE_HEAD && test_must_fail git merge "$c5" 2> out && - grep "Your local changes to .* would be overwritten by merge." out + grep "Your local changes to the following files would be overwritten by merge:" out ' test_expect_success 'merge-recursive remove conflict' ' |