diff options
| author | Diane Gasselin <diane.gasselin@ensimag.imag.fr> | 2010-08-11 10:38:05 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-11 10:36:03 -0700 |
| commit | 23cbf11b5c08c6d0ab0fd0d6f2dc5a32ca31c745 (patch) | |
| tree | 61c94915e74e7118388bcc5bb1422eadf2a83bfe /merge-recursive.h | |
| parent | 08353ebbab2dfdee50a6daa616ec8b6483cb07c8 (diff) | |
| download | git-23cbf11b5c08c6d0ab0fd0d6f2dc5a32ca31c745.tar.gz | |
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 <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index 8412db87eb..08f9850367 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, |