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

Re: [PATCH v2 03/11] Prefer 'up-to-date' spelling

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 7, 2019, 05:16 UTC
Message-ID
<xmqqh83gs1ui.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<466aead9af6516ff94a5d217e58ab894e63088b7.1572973651.git.gitgitgadget@gmail.com>
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 10 quoted lines
> diff --git a/unpack-trees.c b/unpack-trees.c
> index 33ea7810d8..8ba2dc3267 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -29,7 +29,7 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] 
>  	"Entry '%s' would be overwritten by merge. Cannot merge.",
>  
>  	/* ERROR_NOT_UPTODATE_FILE */
> -	"Entry '%s' not uptodate. Cannot merge.",
> +	"Entry '%s' not up-to-date. Cannot merge.",

As the name of this table says, this is a table of the plumbing errors that are given without translation, in order to allow scripts to read and act on them. Wouldn't touching it break the promise to the scripts?

Previous: Junio C HamanoNext: Elijah Newren
Message 7 of 17 in “Thyme two ficks sum Documentaton tyops and speling erors!”
  1. 0/1 Thyme two ficks sum Documentaton tyops and speling erors!Elijah Newren via GitGitGadget, Oct 23, 2019
  2. 1/1 Documentation: fix a bunch of typos, both old and newElijah Newren via GitGitGadget, Oct 23, 2019
  3. 00/11 Thyme two ficks sum Documentaton tyops and speling erors!Elijah Newren via GitGitGadget, Nov 5, 2019
  4. 02/11 Fix spelling errors in documentation outside of Documentation/Elijah Newren via GitGitGadget, Nov 5, 2019
  5. 03/11 Prefer 'up-to-date' spellingElijah Newren via GitGitGadget, Nov 5, 2019
  6. Junio C HamanoNov 7, 2019
  7. Junio C HamanoNov 7, 2019
  8. Elijah NewrenNov 7, 2019
  9. 05/11 Fix spelling errors in comments of testcasesElijah Newren via GitGitGadget, Nov 5, 2019
  10. 04/11 Fix spelling errors in code commentsElijah Newren via GitGitGadget, Nov 5, 2019
  11. 06/11 Fix spelling errors in names of testsElijah Newren via GitGitGadget, Nov 5, 2019
  12. 07/11 Fix spelling errors in messages shown to usersElijah Newren via GitGitGadget, Nov 5, 2019
  13. 09/11 sha1dc: fix trivial comment spelling errorElijah Newren via GitGitGadget, Nov 5, 2019
  14. 08/11 Fix spelling errors in test commandsElijah Newren via GitGitGadget, Nov 5, 2019
  15. 11/11 Fix spelling errors in no-longer-updated-from-upstream modulesElijah Newren via GitGitGadget, Nov 5, 2019
  16. 10/11 multimail: fix a few simple spelling errorsElijah Newren via GitGitGadget, Nov 5, 2019
  17. 01/11 Documentation: fix a bunch of typos, both old and newElijah Newren via GitGitGadget, Nov 5, 2019

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.