From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, "Matthias Rüster" <matthias.ruester@gmail.com>
Subject: Re: [PATCH] bundle: improve message when unknown hash algorithm detected
Date: Sun, 12 Jul 2020 11:10:11 -0700 [thread overview]
Message-ID: <xmqqv9isppto.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200712165005.705979-1-sandals@crustytoothpaste.net> (brian m. carlson's message of "Sun, 12 Jul 2020 16:50:05 +0000")
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> The current code states "unknown hash algorithm length". This is
> slightly confusing, and moreover, we've gotten feedback that it's hard
> to translate into other languages. Since the case is that we cannot
> detect the hash algorithm, let's just say that. This is clearer and
> more direct, reflects the intent of the code (which calls the function
> detect_hash_algo just a few lines above), and will be easier to
> translate.
>
> Suggested-by: Matthias Rüster <matthias.ruester@gmail.com>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> Matthias contacted me privately about this message and I thought since
> we're still in the RC period, it would make sense to include this in to
> help translators and those who aren't native speakers.
Yup, and yuck. Didn't we find any room in the bundle header to
sneak in the actual hash algorithm name in a backward compatible
way? I am actually OK if we declared that v2 bundle files are SHA-1
only and v3 bundle file has an item in the bundle header to say what
hash algorithm is used, than using "ah this uses a hash algorithm
that produces a 32-byte output, so it must be algorithm X", to be
honest.
> bundle.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/bundle.c b/bundle.c
> index 2a0d744d3f..69c807bda9 100644
> --- a/bundle.c
> +++ b/bundle.c
> @@ -66,7 +66,7 @@ static int parse_bundle_header(int fd, struct bundle_header *header,
> if (!header->hash_algo) {
> header->hash_algo = detect_hash_algo(&buf);
> if (!header->hash_algo) {
> - error(_("unknown hash algorithm length"));
> + error(_("unable to detect hash algorithm"));
> status = -1;
> break;
> }
prev parent reply other threads:[~2020-07-12 18:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-12 16:50 [PATCH] bundle: improve message when unknown hash algorithm detected brian m. carlson
2020-07-12 18:10 ` Junio C Hamano [this message]
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=xmqqv9isppto.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=matthias.ruester@gmail.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).