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

Re: [PATCH 5/4] merge-ort: lowercase a few error messages

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 16, 2023, 21:49 UTC
Message-ID
<xmqq34zdbxgn.fsf@gitster.g>
In-Reply-To
<20230916072909.GA992098@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 23 quoted lines
> On Sat, Sep 16, 2023 at 02:01:00AM -0400, Jeff King wrote:
>
>> Here's one more clean-up on top. I hesitated on this for the initial
>> send just because I didn't know if we might want to switch these error
>> messages to path_msg(), which does capitalize sometimes. But Elijah's
>> response convinced me that we should just leave them in place, in which
>> case it makes sense to do a minimal style fixup.
>> 
>> Junio, this is on top of what you've queued in
>> jk/ort-unused-parameter-cleanups.
>> 
>> -- >8 --
>> Subject: [PATCH] merge-ort: lowercase a few error messages
>> 
>> As noted in CodingGuidelines, error messages should not be capitalized.
>> Fix up a few of these that were copied verbatim from merge-recursive to
>> match our modern style.
>
> <sigh> This fails CI because with GIT_TEST_MERGE_ALGORITHM=recursive, we
> run the old merge-recursive code, which uses the capitalized version.
>
> I'm inclined to just drop this minor cleanup for now, and we can worry
> about it later once merge-recursive goes the way of the dodo.

I wonder if it is just the matter of making matching changes to the original error messages in merge-recursive that share the capitalized version?

Previous: Jeff KingNext: Jeff King
Message 14 of 15 in “merge-ort unused parameter cleanups”
  1. 0/4 merge-ort unused parameter cleanupsJeff King, Sep 14, 2023
  2. 1/4 merge-ort: drop custom err() functionJeff King, Sep 14, 2023
  3. Elijah NewrenSep 16, 2023
  4. Jeff KingSep 16, 2023
  5. 2/4 merge-ort: stop passing "opt" to read_oid_strbuf()Jeff King, Sep 14, 2023
  6. 3/4 merge-ort: drop unused parameters from detect_and_process_renames()Jeff King, Sep 14, 2023
  7. Elijah NewrenSep 16, 2023
  8. 4/4 merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()Jeff King, Sep 14, 2023
  9. Elijah NewrenSep 16, 2023
  10. Jeff KingSep 16, 2023
  11. Elijah NewrenSep 16, 2023
  12. 5/4 merge-ort: lowercase a few error messagesJeff King, Sep 16, 2023
  13. Jeff KingSep 16, 2023
  14. Junio C HamanoSep 16, 2023
  15. Jeff KingSep 16, 2023

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.