Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
Not only this makes the code clearer since setting up the porcelain error message is meant to work with show_all_errors, but this fixes a call to setup_unpack_trees_porcelain() in git_merge_trees() which did not set show_all_errors. add_rejected_path() used to double-check whether it was running in plumbing mode. This check was ineffective since it was setting show_all_errors too late for traverse_trees() to see it, and is made useless by this patch. Remove it. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Sep 2, 2010 at 18:08 UTC
5e65ee35ddd306d6e6c86efc1c95315942f87811
4 files changed
+3
-9
builtin/checkout.c
-1
@@ -392,7 +392,6 @@ static int merge_working_tree(struct checkout_opts *opts,
392
topts.dir = xcalloc(1, sizeof(*topts.dir));
393
topts.dir->flags |= DIR_SHOW_IGNORED;
394
topts.dir->exclude_per_dir = ".gitignore";
395
- topts.show_all_errors = 1;
395
tree = parse_tree_indirect(old->commit ?
396
old->commit->object.sha1 :
397
(unsigned char *)EMPTY_TREE_SHA1_BIN);
builtin/merge.c
-1
@@ -704,7 +704,6 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote
704
opts.verbose_update = 1;
705
opts.merge = 1;
706
opts.fn = twoway_merge;
707
- opts.show_all_errors = 1;
707
setup_unpack_trees_porcelain(&opts, "merge");
708
709
trees[nr_trees] = parse_tree_indirect(head);
unpack-trees.c
+2
-6
@@ -94,6 +94,8 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
94
"The following Working tree files would be overwritten by sparse checkout update:\n%s";
95
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
96
"The following Working tree files would be removed by sparse checkout update:\n%s";
97
+
98
+ opts->show_all_errors = 1;
99
}
100
101
static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
@@ -120,12 +122,6 @@ static int add_rejected_path(struct unpack_trees_options *o,
122
const char *path)
123
{
124
struct rejected_paths_list *newentry;
123
- int porcelain = o && (o)->msgs[e];
124
- /*
125
- * simply display the given error message if in plumbing mode
126
- */
127
- if (!porcelain)
128
- o->show_all_errors = 0;
125
if (!o->show_all_errors)
126
return error(ERRORMSG(o, e), path);
127
unpack-trees.h
+1
-1
@@ -24,7 +24,7 @@ enum unpack_trees_error_types {
24
25
/*
26
* Sets the list of user-friendly error messages to be used by the
27
- * command "cmd" (either merge or checkout)
27
+ * command "cmd" (either merge or checkout), and show_all_errors to 1.
28
*/
29
void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
30
const char *cmd);