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: "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: Thu, 30 Jan 2020 11:16:13 -0800	[thread overview]
Message-ID: <xmqqeevgdabm.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200130071700.GB2189233@coredump.intra.peff.net> (Jeff King's message of "Thu, 30 Jan 2020 02:17:00 -0500")

Jeff King <peff@peff.net> writes:

> I think we can do this much more simply, by just using i18ncmp:
>
> diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
> index c2b5125c12..62085a89e3 100755
> --- a/t/t1506-rev-parse-diagnosis.sh
> +++ b/t/t1506-rev-parse-diagnosis.sh
> @@ -12,7 +12,7 @@ test_did_you_mean ()
>  	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
> +	test_i18ncmp expected error
>  }

Yeah, "what die(_(...)) under POISON says matches /^fatal:/"
probably is not worth checking and more importantly not something we
would want to rely on.

>  HASH_file=
>
> (we'd still need the s/grep/test_i18ngrep/ in your second hunk).

Yes.  The final amend to 3/3 has become like this.

$ git range-diff bc3f657f71..83252ba6f1 HEAD^..HEAD
1:  83252ba6f1 ! 1:  b0418303b1 sha1-name: mark get_oid() error messages for translation
    @@ t/t1506-rev-parse-diagnosis.sh: exec </dev/null
     +	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
    +-	test_cmp expected error
    ++	test_i18ncmp expected error
      }
    + 
    + HASH_file=
     @@ t/t1506-rev-parse-diagnosis.sh: test_expect_success 'correct relative file objects (6)' '
      
      test_expect_success 'incorrect revision id' '
    @@ t/t1506-rev-parse-diagnosis.sh: test_expect_success 'incorrect file in :path and
      '
      
      test_expect_success 'relative path not found' '
    + 	(
    + 		cd subdir &&
    + 		test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error &&
    +-		grep subdir/nonexistent.txt error
    ++		test_i18ngrep subdir/nonexistent.txt error
    + 	)
    + '
    + 
     @@ t/t1506-rev-parse-diagnosis.sh: test_expect_success 'relative path outside worktree' '
      test_expect_success 'relative path when cwd is outside worktree' '
      	test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error &&


  reply	other threads:[~2020-01-30 19:16 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
2020-01-29 21:42         ` Junio C Hamano
2020-01-30  7:17           ` Jeff King
2020-01-30 19:16             ` Junio C Hamano [this message]
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

  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=xmqqeevgdabm.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.
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).