From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "David Burström" <davidburstrom@spotify.com>, git@vger.kernel.org
Subject: Re: [PATCH 3/3] sha1-name: mark get_oid() error messages for translation
Date: Wed, 29 Jan 2020 13:30:57 -0800 [thread overview]
Message-ID: <xmqqpnf2dk6m.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200125001301.GC567109@coredump.intra.peff.net> (Jeff King's message of "Fri, 24 Jan 2020 19:13:01 -0500")
Jeff King <peff@peff.net> writes:
> + die(_("path '%s' exists, but not '%s'\n"
> + "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
> ...
The above is meant to be localizable, but...
> diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
> index f49fc770d6..c2b5125c12 100755
> --- a/t/t1506-rev-parse-diagnosis.sh
> +++ b/t/t1506-rev-parse-diagnosis.sh
> @@ -9,8 +9,8 @@ exec </dev/null
> test_did_you_mean ()
> {
> cat >expected <<-EOF &&
> - fatal: Path '$2$3' $4, but not ${5:-$SQ$3$SQ}.
> - Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}?
> + fatal: path '$2$3' $4, but not ${5:-$SQ$3$SQ}
> + hint: Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}?
> EOF
> test_cmp expected error
...this obviously would not allow GIT_TEST_GETTEXT_POISON test to
pass. And ...
> test_expect_success 'incorrect file in sha1:path' '
> test_must_fail git rev-parse HEAD:nothing.txt 2>error &&
> - grep "fatal: Path '"'"'nothing.txt'"'"' does not exist in '"'"'HEAD'"'"'" error &&
> + test_i18ngrep "path .nothing.txt. does not exist in .HEAD." error &&
> test_must_fail git rev-parse HEAD:index-only.txt 2>error &&
> - grep "fatal: Path '"'"'index-only.txt'"'"' exists on disk, but not in '"'"'HEAD'"'"'." error &&
> + test_i18ngrep "path .index-only.txt. exists on disk, but not in .HEAD." error &&
> (cd subdir &&
> test_must_fail git rev-parse HEAD:file2.txt 2>error &&
> test_did_you_mean HEAD subdir/ file2.txt exists )
> '
... the last step executed in "subdir" does not seem to pass.
next prev parent reply other threads:[~2020-01-29 21:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 12:45 Bug or unexpected behaviour in git show <rev>:a\b David Burström
2020-01-24 19:01 ` Jeff King
2020-01-24 19:27 ` Junio C Hamano
2020-01-25 0:00 ` Jeff King
2020-01-25 13:21 ` David Burström
2020-01-27 18:47 ` Junio C Hamano
2020-01-25 0:05 ` Jeff King
2020-01-25 0:06 ` [PATCH 1/3] t1400: avoid "test" string comparisons Jeff King
2020-01-25 0:06 ` [PATCH 2/3] t1506: drop space after redirection operator Jeff King
2020-01-25 0:13 ` [PATCH 3/3] sha1-name: mark get_oid() error messages for translation Jeff King
2020-01-29 21:30 ` Junio C Hamano [this message]
2020-01-29 21:42 ` Junio C Hamano
2020-01-30 7:17 ` Jeff King
2020-01-30 19:16 ` Junio C Hamano
2020-01-31 0:15 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpnf2dk6m.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=davidburstrom@spotify.com \
--cc=git@vger.kernel.org \
--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.
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 NNTP newsgroup(s).