Re: [PATCH] unpack-trees.c: align submodule error message to the other error messages
From: Junio C Hamano <hidden>
Date: 2017-03-29 22:47:14
Stefan Beller [off-list ref] writes:
quoted hunk
As the place holder in the error message is for multiple submodules, we don't want to encapsulate the string place holder in single quotes. Signed-off-by: Stefan Beller <redacted> ---quoted
Nitpicking about wording: unless the user has adopted a strongly object-oriented point of view, it is Git that cannot checkout a new HEAD, not the submodule. How about: _("Cannot update submodule:\n%s")quoted
That's vague, but if I understand correctly the way this error gets used is equally vague --- i.e., a clearer message would involve finer-grained error codes.Makes sense. Here is the patch. Let's roll this as its own instead of waiting for the discussion on the other patch to settle. Thanks, Stefan unpack-trees.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/unpack-trees.c b/unpack-trees.c index 8333da2cc9..0d82452f7f 100644 --- a/unpack-trees.c +++ b/unpack-trees.c@@ -167,7 +167,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = _("The following working tree files would be removed by sparse checkout update:\n%s"); msgs[ERROR_WOULD_LOSE_SUBMODULE] = - _("Submodule '%s' cannot checkout new HEAD"); + _("Cannot update submodule:\n%s")
Missing ';'. I'll fix locally, but the final integration result won't be pushed out until later tonight, as I need to redo jch and pu branches with a fixed version.
opts->show_all_errors = 1; /* rejected paths may not have a static buffer */