summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-04 05:23:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-04 05:23:49 (GMT)
commitc208e05bd9880028c980fafbc5dda3d17a603ac1 (patch)
tree25d587aacf885345b2b001bc006ac3871b5c7a4b /builtin/checkout.c
parentf92d62ec4ead67109418483b65aaf158b7462121 (diff)
parentc5978a507ca20b12008724f78237784193fb9489 (diff)
downloadgit-c208e05bd9880028c980fafbc5dda3d17a603ac1.zip
git-c208e05bd9880028c980fafbc5dda3d17a603ac1.tar.gz
git-c208e05bd9880028c980fafbc5dda3d17a603ac1.tar.bz2
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages: t7609-merge-co-error-msgs: test non-fast forward case too. Move "show_all_errors = 1" to setup_unpack_trees_porcelain() setup_unpack_trees_porcelain: take the whole options struct as parameter Move set_porcelain_error_msgs to unpack-trees.c and rename it Conflicts: merge-recursive.c
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index ff5ac1e..aae80c3 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -380,7 +380,7 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.src_index = &the_index;
topts.dst_index = &the_index;
- set_porcelain_error_msgs(topts.msgs, "checkout");
+ setup_unpack_trees_porcelain(&topts, "checkout");
refresh_cache(REFRESH_QUIET);
@@ -399,7 +399,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);