git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH 5/4] merge-ort: lowercase a few error messages
Date: Sat, 16 Sep 2023 14:49:12 -0700	[thread overview]
Message-ID: <xmqq34zdbxgn.fsf@gitster.g> (raw)
In-Reply-To: <20230916072909.GA992098@coredump.intra.peff.net> (Jeff King's message of "Sat, 16 Sep 2023 03:29:09 -0400")

Jeff King <peff@peff.net> writes:

> 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?

  reply	other threads:[~2023-09-16 21:50 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-14  9:34 [PATCH 0/4] merge-ort unused parameter cleanups Jeff King
2023-09-14  9:39 ` [PATCH 1/4] merge-ort: drop custom err() function Jeff King
2023-09-16  2:54   ` Elijah Newren
2023-09-16  5:50     ` Jeff King
2023-09-14  9:39 ` [PATCH 2/4] merge-ort: stop passing "opt" to read_oid_strbuf() Jeff King
2023-09-14  9:39 ` [PATCH 3/4] merge-ort: drop unused parameters from detect_and_process_renames() Jeff King
2023-09-16  3:04   ` Elijah Newren
2023-09-14  9:40 ` [PATCH 4/4] merge-ort: drop unused "opt" parameter from merge_check_renames_reusable() Jeff King
2023-09-16  3:09   ` Elijah Newren
2023-09-16  5:52     ` Jeff King
2023-09-16  2:56 ` [PATCH 0/4] merge-ort unused parameter cleanups Elijah Newren
2023-09-16  6:00 ` [PATCH 5/4] merge-ort: lowercase a few error messages Jeff King
2023-09-16  7:29   ` Jeff King
2023-09-16 21:49     ` Junio C Hamano [this message]
2023-09-16 22:11       ` Jeff King

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq34zdbxgn.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=peff@peff.net \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).