mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: porcelain messages for checkout

Browse Source 
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@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Diane Gasselin
2010-08-11 10:38:05 +02:00
committed by Junio C Hamano
parent 08353ebbab
commit 23cbf11b5c
5 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
merge-recursive.c
View File

@ -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[ERROR_WOULD_OVERWRITE] = msgs[ERROR_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[ERROR_WOULD_OVERWRITE] = msgs[ERROR_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[ERROR_WOULD_OVERWRITE] = tmp;
msgs[ERROR_NOT_UPTODATE_FILE] = tmp;
msgs[ERROR_NOT_UPTODATE_DIR] =
"Updating '%s' would lose untracked files in it. Aborting.";
msgs[ERROR_WOULD_LOSE_UNTRACKED] =
"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[ERROR_WOULD_LOSE_UNTRACKED] = tmp;
}
int merge_trees(struct merge_options *o,