t7609: test merge and checkout error messages

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 22bf47cb6f0734270baa6d90f5a9eaad33a7401d..894bb84db515b1b371cf356785dd1807ed1ec5ab 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -392,6 +392,7 @@ static int merge_working_tree(struct checkout_opts *opts,
                topts.dir = xcalloc(1, sizeof(*topts.dir));
                topts.dir->flags |= DIR_SHOW_IGNORED;
                topts.dir->exclude_per_dir = ".gitignore";
+               topts.show_all_errors = 1;
                tree = parse_tree_indirect(old->commit ?
                                           old->commit->object.sha1 :
                                           (unsigned char *)EMPTY_TREE_SHA1_BIN);