summaryrefslogtreecommitdiff
path: root/t/t7609-merge-co-error-msgs.sh
AgeCommit message (Collapse)AuthorFilesLines
2011-09-21unpack-trees: print "Aborting" to stderrLibravatar Michael J Gruber1-0/+5
display_error_msgs() prints all the errors to stderr already (if any), followed by "Aborting" (if any) to stdout. Make the latter go to stderr instead. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-11-15use persistent memory for rejected pathsLibravatar Clemens Buchacher1-8/+8
An aborted merge prints the list of rejected paths as part of the error message. Since commit f66caaf9 (do not overwrite files in leading path), some of those paths do not have static buffers, so we have to keep a copy. Use string_list's to accomplish this. This changes the order of the list to the order in which the paths are processed. Previously, it was reversed. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-09-03t7609-merge-co-error-msgs: test non-fast forward case too.Libravatar Matthieu Moy1-2/+10
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-11t7609: test merge and checkout error messagesLibravatar Diane Gasselin1-0/+125
Test porcelain and plumbing error messages for different types of errors of merge and checkout. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>