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

Re: [PATCH v3] merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 8, 2010, 00:26 UTC
Message-ID
<7vd3uystsh.fsf@alter.siamese.dyndns.org>
In-Reply-To
<9aea70210996b395f5fc04ae48a372f9b51ba182.1278489069.git.nicolas.s.dev@gmx.fr>
Nicolas Sebrecht <nicolas.s.dev@gmx.fr> writes:
Show 14 quoted lines
> Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
> ---
>
> The 07/07/10, Junio C Hamano wrote:
>
>> The "struct unpack_trees_error_msgs" mechanism was introduced so that we
>> can change the Porcelain level messages without breaking the plumbing API,
>> which these messages are part of.  Please see 8ccba00 (unpack-trees: allow
>> Porcelain to give different error messages, 2008-05-17) and fadd069
>> (merge-recursive: give less scary messages when merge did not start,
>> 2009-09-07) for backstory.
>
> Oh, thanks. I was unaware of this mechanism and didn't care about what I was
> touching.

I suspect that the documentation patch talks about a nonexistent reality. See 8ccba00 again ;-)

Previous: Nicolas SebrechtNext: Nicolas Sebrecht
Message 10 of 16 in “messages confusing”
  1. Nicolas SebrechtJul 6, 2010
  2. Wincent ColaiutaJul 6, 2010
  3. use "up-to-date" in messages instead of "uptodate" for consistencyNicolas Sebrecht, Jul 6, 2010
  4. Ævar Arnfjörð BjarmasonJul 6, 2010
  5. use "up-to-date" instead of "uptodate" for consistencyNicolas Sebrecht, Jul 6, 2010
  6. Junio C HamanoJul 7, 2010
  7. Re: use "up-to-date" instead of "uptodate" for consistencyNicolas Sebrecht, Jul 7, 2010
  8. Junio C HamanoJul 7, 2010
  9. merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistencyNicolas Sebrecht, Jul 7, 2010
  10. Junio C HamanoJul 8, 2010
  11. 1/2 checkout: accord documentation to what git doesNicolas Sebrecht, Jul 9, 2010
  12. Junio C HamanoJul 10, 2010
  13. 2/2 merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistencyNicolas Sebrecht, Jul 9, 2010
  14. Junio C HamanoJul 10, 2010
  15. Junio C HamanoJul 6, 2010
  16. Nicolas SebrechtJul 6, 2010

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.