From: Diane Gasselin Date: Wed, 09 Jun 2010 12:44:04 GMT Subject: [RFC/ PATCH 3/5] unpack_trees_options: update porcelain messages Message-ID: <1276087446-25112-5-git-send-email-diane.gasselin@ensimag.imag.fr> In-Reply-To: <1276087446-25112-4-git-send-email-diane.gasselin@ensimag.imag.fr> From: Diane Update porcelain messages of unpack_trees_options in order to have a good layout. Signed-off-by: Diane Gasselin Signed-off-by: Axel Bonnet Signed-off-by: Clément Poulain --- builtin/checkout.c | 2 +- merge-recursive.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 88b1f43..9b2dca6 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -372,7 +372,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."; + topts.msgs.not_uptodate_file = "You have local changes to:\n%scannot switch branches."; refresh_cache(REFRESH_QUIET); diff --git a/merge-recursive.c b/merge-recursive.c index 206c103..62c07ab 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1182,19 +1182,19 @@ struct unpack_trees_error_msgs get_porcelain_error_msgs(void) { struct unpack_trees_error_msgs msgs = { /* would_overwrite */ - "Your local changes to '%s' would be overwritten by merge. Aborting.", + "Your local changes to the files:\n%swould be overwritten by merge.", /* not_uptodate_file */ - "Your local changes to '%s' would be overwritten by merge. Aborting.", + "Your local changes to the files:\n%swould be overwritten by merge.", /* not_uptodate_dir */ - "Updating '%s' would lose untracked files in it. Aborting.", + "Updating the directories:\n%swould lose untracked files in it.", /* would_lose_untracked */ - "Untracked working tree file '%s' would be %s by merge. Aborting", + "Untracked working tree files:\n%swould be %s by merge.", /* bind_overlap -- will not happen here */ NULL, }; if (advice_commit_before_merge) { msgs.would_overwrite = msgs.not_uptodate_file = - "Your local changes to '%s' would be overwritten by merge. Aborting.\n" + "Your local changes to the files:\n%swould be overwritten by merge.\n" "Please, commit your changes or stash them before you can merge."; } return msgs; -- 1.6.6.7.ga5fe3