path: root/builtin/checkout.c
diff options
authorDiane Gasselin <>2010-08-11 08:38:05 (GMT)
committerJunio C Hamano <>2010-08-11 17:36:03 (GMT)
commit23cbf11b5c08c6d0ab0fd0d6f2dc5a32ca31c745 (patch)
tree61c94915e74e7118388bcc5bb1422eadf2a83bfe /builtin/checkout.c
parent08353ebbab2dfdee50a6daa616ec8b6483cb07c8 (diff)
merge-recursive: porcelain messages for checkout
A porcelain message was first added in checkout.c in the commit 8ccba008 (Junio C Hamano, Sat May 17 21:03:49 2008, unpack-trees: allow Porcelain to give different error messages) to give better feedback in the case of merge errors. This patch adapts the porcelain messages for the case of checkout instead. This way, when having a checkout error, "merge" no longer appears in the error message. While we're there, we add an advice in the case of would_lose_untracked_file. Signed-off-by: Matthieu Moy <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/checkout.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 7d1706e..22bf47c 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -373,7 +373,7 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.src_index = &the_index;
topts.dst_index = &the_index;
- topts.msgs[ERROR_NOT_UPTODATE_FILE] = "You have local changes to '%s'; cannot switch branches.";
+ set_porcelain_error_msgs(topts.msgs, "checkout");