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);
opts.verbose_update = 1;
opts.merge = 1;
opts.fn = twoway_merge;
- opts.show_all_errors = 1;
setup_unpack_trees_porcelain(&opts, "merge");
trees[nr_trees] = parse_tree_indirect(head);
"The following Working tree files would be overwritten by sparse checkout update:\n%s";
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
"The following Working tree files would be removed by sparse checkout update:\n%s";
+
+ opts->show_all_errors = 1;
}
static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
const char *path)
{
struct rejected_paths_list *newentry;
- int porcelain = o && (o)->msgs[e];
- /*
- * simply display the given error message if in plumbing mode
- */
- if (!porcelain)
- o->show_all_errors = 0;
if (!o->show_all_errors)
return error(ERRORMSG(o, e), path);
/*
* Sets the list of user-friendly error messages to be used by the
- * command "cmd" (either merge or checkout)
+ * command "cmd" (either merge or checkout), and show_all_errors to 1.
*/
void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
const char *cmd);