From: Junio C Hamano <gitster@pobox.com>
To: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH v2 03/11] Prefer 'up-to-date' spelling
Date: Thu, 07 Nov 2019 14:16:21 +0900 [thread overview]
Message-ID: <xmqqh83gs1ui.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <466aead9af6516ff94a5d217e58ab894e63088b7.1572973651.git.gitgitgadget@gmail.com> (Elijah Newren via GitGitGadget's message of "Tue, 05 Nov 2019 17:07:22 +0000")
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 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?
next prev parent reply other threads:[~2019-11-07 5:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 0:29 [PATCH 0/1] Thyme two ficks sum Documentaton tyops and speling erors! Elijah Newren via GitGitGadget
2019-10-23 0:29 ` [PATCH 1/1] Documentation: fix a bunch of typos, both old and new Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 00/11] Thyme two ficks sum Documentaton tyops and speling erors! Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 01/11] Documentation: fix a bunch of typos, both old and new Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 02/11] Fix spelling errors in documentation outside of Documentation/ Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 03/11] Prefer 'up-to-date' spelling Elijah Newren via GitGitGadget
2019-11-07 5:11 ` Junio C Hamano
2019-11-07 5:16 ` Junio C Hamano [this message]
2019-11-07 17:01 ` Elijah Newren
2019-11-05 17:07 ` [PATCH v2 04/11] Fix spelling errors in code comments Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 05/11] Fix spelling errors in comments of testcases Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 06/11] Fix spelling errors in names of tests Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 07/11] Fix spelling errors in messages shown to users Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 08/11] Fix spelling errors in test commands Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 09/11] sha1dc: fix trivial comment spelling error Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 10/11] multimail: fix a few simple spelling errors Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 11/11] Fix spelling errors in no-longer-updated-from-upstream modules Elijah Newren via GitGitGadget
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=xmqqh83gs1ui.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
/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).