Move "show_all_errors = 1" to setup_unpack_trees_porcelain()

[git.git] / builtin / checkout.c

diff --git a/builtin/checkout.c b/builtin/checkout.c
index f6caac104750a154d8934d570b3e099c2f5f27fc..f3dfb7b8046cc92e578303e00e54eae53b2bc054 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -392,7 +392,6 @@ 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);