From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org, jrnieder@gmail.com
Subject: Re: [PATCH] unpack-trees.c: align submodule error message to the other error messages
Date: Wed, 29 Mar 2017 15:47:07 -0700 [thread overview]
Message-ID: <xmqq60ir8zv8.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170329223424.4678-1-sbeller@google.com> (Stefan Beller's message of "Wed, 29 Mar 2017 15:34:24 -0700")
Stefan Beller <sbeller@google.com> writes:
> 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 <sbeller@google.com>
> ---
>
>> 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")
>
>> 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 */
next prev parent reply other threads:[~2017-03-29 22:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 18:37 [PATCH 1/2] entry.c: submodule recursing: respect force flag correctly Stefan Beller
2017-03-29 18:37 ` [PATCH 2/2] unpack-trees.c: align submodule error message to the other error messages Stefan Beller
2017-03-29 18:48 ` Jonathan Nieder
2017-03-29 21:33 ` Junio C Hamano
2017-03-29 22:34 ` [PATCH] " Stefan Beller
2017-03-29 22:47 ` Junio C Hamano [this message]
2017-03-29 18:45 ` [PATCH 1/2] entry.c: submodule recursing: respect force flag correctly Jonathan Nieder
2017-03-29 21:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq60ir8zv8.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.