git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] unpack-trees.c: align submodule error message to the other error messages

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 29, 2017, 21:33 UTC
Message-ID
<xmqqy3vn93a9.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20170329184833.GX31294@aiede.mtv.corp.google.com>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 34 quoted lines
> Stefan Beller wrote:
>
>> 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.
>
> Makes sense.
>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>>  unpack-trees.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/unpack-trees.c b/unpack-trees.c
>> index 8333da2cc9..9f386cc174 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");
>> +		_("The following submodules cannot checkout a new HEAD:\n%s");
>
> 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 to me.
Thanks for helping.
Previous: Jonathan NiederNext: Stefan Beller
Message 4 of 8 in “entry.c: submodule recursing: respect force flag correctly”
  1. 1/2 entry.c: submodule recursing: respect force flag correctlyStefan Beller, Mar 29, 2017
  2. 2/2 unpack-trees.c: align submodule error message to the other error messagesStefan Beller, Mar 29, 2017
  3. Jonathan NiederMar 29, 2017
  4. Junio C HamanoMar 29, 2017
  5. unpack-trees.c: align submodule error message to the other error messagesStefan Beller, Mar 29, 2017
  6. Junio C HamanoMar 29, 2017
  7. Jonathan NiederMar 29, 2017
  8. Junio C HamanoMar 29, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.