From: Derrick Stolee <stolee@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH] messages: avoid SHA-1 in end-user facing messages
Date: Thu, 13 Aug 2020 22:21:51 -0400 [thread overview]
Message-ID: <ee61b773-91c0-4b30-1d5b-e941bba03867@gmail.com> (raw)
In-Reply-To: <xmqqy2miyr0f.fsf@gitster.c.googlers.com>
On 8/13/2020 9:07 PM, Junio C Hamano wrote:
> There are still a handful mentions of SHA-1 when we meant the
> (hexadecimal) object names in end-user facing messages. Rewrite
> them.
>
> I was hoping that this can mostly be s/SHA-1/object name/, but
> a few messages needed rephrasing to keep the result readable.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> builtin/blame.c | 2 +-
> builtin/name-rev.c | 2 +-
> builtin/pack-objects.c | 2 +-
> parse-options.h | 2 +-
> t/t0040-parse-options.sh | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/blame.c b/builtin/blame.c
> index 94ef57c1cc..76ffdf11c6 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -842,7 +842,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
> const char *contents_from = NULL;
> const struct option options[] = {
> N_("Show blank SHA-1 for boundary commits (Default: off)")),
> N_("Blank object names of boundary commits (Default: off)")),
Is there a reason you dropped "show" here? Perhaps your
intention is to use "blank" as a verb, but it read a bit
awkwardly to me.
> N_("print only names (no SHA-1)")),
> N_("print only ref-based names (no object names)")),
> die("not an SHA-1 '%s'", line + 10);
> die("not an object name '%s'", line + 10);
> N_("use <n> digits to display SHA-1s"), \
> N_("use <n> digits to display object names"), \
> use <n> digits to display SHA-1s
> use <n> digits to display object names
These all seem obviously correct.
Thanks,
-Stolee
next prev parent reply other threads:[~2020-08-14 2:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-14 1:07 [PATCH] messages: avoid SHA-1 in end-user facing messages Junio C Hamano
2020-08-14 1:11 ` brian m. carlson
2020-08-14 2:21 ` Derrick Stolee [this message]
2020-08-14 4:45 ` Junio C Hamano
2020-08-14 4:51 ` Eric Sunshine
2020-08-14 8:22 ` Junio C Hamano
2020-08-14 12:21 ` Derrick Stolee
2020-08-14 16:31 ` Junio C Hamano
2020-08-14 16:40 ` [PATCH v2] " Junio C Hamano
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=ee61b773-91c0-4b30-1d5b-e941bba03867@gmail.com \
--to=stolee@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.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).