summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-22 06:26:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-22 06:26:46 (GMT)
commit2eb54692d145a0c2939698302e913975f059ac34 (patch)
tree88911c7cd362f52770bded7c03b73f32a7d8abb7 /builtin/checkout.c
parenta0b6a9d2b2b0667bc170c864a05b3ec4635a71bb (diff)
parente935e62a0fd26ff1f29a98a4ca8fa693f42357a2 (diff)
downloadgit-2eb54692d145a0c2939698302e913975f059ac34.zip
git-2eb54692d145a0c2939698302e913975f059ac34.tar.gz
git-2eb54692d145a0c2939698302e913975f059ac34.tar.bz2
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages: t7609: test merge and checkout error messages unpack_trees: group error messages by type merge-recursive: distinguish "removed" and "overwritten" messages merge-recursive: porcelain messages for checkout Turn unpack_trees_options.msgs into an array + enum Conflicts: t/t3400-rebase.sh
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 7f81120..7250e5c 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -376,7 +376,7 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.src_index = &the_index;
topts.dst_index = &the_index;
- topts.msgs.not_uptodate_file = "You have local changes to '%s'; cannot switch branches.";
+ set_porcelain_error_msgs(topts.msgs, "checkout");
refresh_cache(REFRESH_QUIET);
@@ -395,6 +395,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);