From: Diane Gasselin <diane.gasselin@xxxxxxxxxxxxxxx>
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 <Matthieu.Moy@xxxxxxx>
---
builtin/checkout.c | 2 +-
builtin/merge.c | 2 +-
merge-recursive.c | 31 ++++++++++++++++++++++---------
merge-recursive.h | 7 +++++--
4 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 8854aab..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[not_uptodate_file] = "You have local changes to '%s'; cannot switch branches.";
+ set_porcelain_error_msgs(topts.msgs, "checkout");
refresh_cache(REFRESH_QUIET);
diff --git a/builtin/merge.c b/builtin/merge.c
index 115a288..de5a0f6 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -704,7 +704,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote
opts.verbose_update = 1;
opts.merge = 1;
opts.fn = twoway_merge;
- set_porcelain_error_msgs(opts.msgs);
+ set_porcelain_error_msgs(opts.msgs, "merge");
trees[nr_trees] = parse_tree_indirect(head);
if (!trees[nr_trees++])
diff --git a/merge-recursive.c b/merge-recursive.c
index 755f530..bd26497 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -185,7 +185,7 @@ static int git_merge_trees(int index_only,
opts.fn = threeway_merge;
opts.src_index = &the_index;
opts.dst_index = &the_index;
- set_porcelain_error_msgs(opts.msgs);
+ set_porcelain_error_msgs(opts.msgs, "merge");
init_tree_desc_from_tree(t+0, common);
init_tree_desc_from_tree(t+1, head);
@@ -1178,19 +1178,32 @@ static int process_entry(struct merge_options *o,
return clean_merge;
}
-void set_porcelain_error_msgs(const char **msgs)
+void set_porcelain_error_msgs(const char **msgs, const char *cmd)
{
+ const char *msg;
+ char *tmp;
+ const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
if (advice_commit_before_merge)
- msgs[would_overwrite] = msgs[not_uptodate_file] =
- "Your local changes to '%s' would be overwritten by merge. Aborting.\n"
- "Please, commit your changes or stash them before you can merge.";
+ msg = "Your local changes to '%%s' would be overwritten by %s. Aborting.\n"
+ "Please, commit your changes or stash them before you can %s.";
else
- msgs[would_overwrite] = msgs[not_uptodate_file] =
- "Your local changes to '%s' would be overwritten by merge. Aborting.";
+ msg = "Your local changes to '%%s' would be overwritten by %s. Aborting.";
+ tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 3);
+ sprintf(tmp, msg, cmd, cmd2);
+ msgs[would_overwrite] = tmp;
+ msgs[not_uptodate_file] = tmp;
+
msgs[not_uptodate_dir] =
"Updating '%s' would lose untracked files in it. Aborting.";
- msgs[would_lose_untracked_file] =
- "Untracked working tree file '%s' would be %s by merge. Aborting";
+
+ if (advice_commit_before_merge)
+ msg = "Untracked working tree file '%%s' would be %%s by %s. Aborting"
+ "Please move or remove them before you can %s.";
+ else
+ msg = "Untracked working tree file '%%s' would be %%s by %s. Aborting";
+ tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 3);
+ sprintf(tmp, msg, cmd, cmd2);
+ msgs[would_lose_untracked_file] = tmp;
}
int merge_trees(struct merge_options *o,
diff --git a/merge-recursive.h b/merge-recursive.h
index 8412db8..08f9850 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -23,8 +23,11 @@ struct merge_options {
struct string_list current_directory_set;
};
-/* Sets the list of user-friendly error messages to be used by merge */
-void set_porcelain_error_msgs(const char **msgs);
+/*
+ * Sets the list of user-friendly error messages to be used by the
+ * command "cmd" (either merge or checkout)
+ */
+void set_porcelain_error_msgs(const char **msgs, const char *cmd);
/* merge_trees() but with recursive ancestor consolidation */
int merge_recursive(struct merge_options *o,
--
1.7.2.1.52.g95e25.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html