From: Junio C Hamano <gitster@pobox.com>
To: Alexey Shumkin <alex.crezoff@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v4 3/4] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting
Date: Thu, 24 Jan 2013 12:44:15 -0800 [thread overview]
Message-ID: <7vr4la9uqo.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <6de583a2d281b1614c69d5e7b6f5c4495488f6a3.1359018188.git.Alex.Crezoff@gmail.com> (Alexey Shumkin's message of "Thu, 24 Jan 2013 13:10:27 +0400")
Alexey Shumkin <alex.crezoff@gmail.com> writes:
> The following two commands are expected to give the same output to a terminal:
>
> $ git log --oneline --no-color
> $ git log --pretty=format:'%h %s'
>
> However, the former pays attention to i18n.logOutputEncoding
> configuration, while the latter does not when it format "%s".
> Log messages written in an encoding i18n.commitEncoding which differs
> from terminal encoding are shown corrupted with the latter even
> when i18n.logOutputEncoding and terminal encoding are the same.
>
> The same corruption is true for
> $ git diff --submodule=log
> and
> $ git rev-list --pretty=format:%s HEAD
> and
> $ git reset --hard
>
> Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
> ---
> t/t4041-diff-submodule-option.sh | 33 ++++++++-------
> t/t4205-log-pretty-formats.sh | 43 +++++++++++++++----
> t/t6006-rev-list-format.sh | 90 ++++++++++++++++++++++++++--------------
> t/t7102-reset.sh | 32 +++++++++++---
> 4 files changed, 138 insertions(+), 60 deletions(-)
>
> diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
> index 32d4a60..e7d6363 100755
> --- a/t/t4041-diff-submodule-option.sh
> +++ b/t/t4041-diff-submodule-option.sh
> @@ -1,6 +1,7 @@
> #!/bin/sh
> #
> # Copyright (c) 2009 Jens Lehmann, based on t7401 by Ping Yin
> +# Copyright (c) 2011 Alexey Shumkin (+ non-UTF-8 commit encoding tests)
> #
>
> test_description='Support for verbose submodule differences in git diff
> @@ -10,6 +11,7 @@ This test tries to verify the sanity of the --submodule option of git diff.
>
> . ./test-lib.sh
>
> +added=$(printf "\320\264\320\276\320\261\320\260\320\262\320\273\320\265\320\275")
Please have an in-code comment before this line to explain what this
variable is about, e.g.
# String "added" in Russian, encoded in UTF-8, used in
# sample commit log messages in add_file() function below.
added=$(printf "...")
> add_file () {
> (
> cd "$1" &&
> @@ -19,7 +21,8 @@ add_file () {
> echo "$name" >"$name" &&
> git add "$name" &&
> test_tick &&
> - git commit -m "Add $name" || exit
> + msg_added_cp1251=$(echo "Add $name ($added $name)" | iconv -f utf-8 -t cp1251) &&
> + git -c 'i18n.commitEncoding=cp1251' commit -m "$msg_added_cp1251"
> done >/dev/null &&
> git rev-parse --short --verify HEAD
> )
Does this patch make the all tests in this script fail for people
without cp1251 locale installed? We already have tests that depend
on 8859-1 and some other locales, and we'd be better off limiting
such dependency to the minimum.
Same comment applies to the changes to other test scripts.
Thanks.
next prev parent reply other threads:[~2013-01-24 20:44 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-22 7:06 git log --oneline and git log --pretty=format... give differrent outputs Shumkin Alexey
2011-07-22 7:53 ` Alexey Shumkin
2011-07-25 10:31 ` [PATCH] pretty: user format ignores i18n.logOutputEncoding setting Alexey Shumkin
2011-07-25 10:31 ` Alexey Shumkin
2011-07-25 19:45 ` Junio C Hamano
2011-07-26 13:18 ` Alexey Shumkin
2011-09-09 8:43 ` [PATCH v2] " Alexey Shumkin
2011-09-09 8:43 ` [PATCH 1/2] pretty: Add failing tests: " Alexey Shumkin
2011-09-09 8:43 ` [PATCH 2/2] pretty: " Alexey Shumkin
2011-09-09 8:53 ` [PATCH v2] " Alexey Shumkin
2011-09-09 8:53 ` [PATCH 1/2] pretty: Add failing tests: " Alexey Shumkin
2011-09-09 22:54 ` Junio C Hamano
2011-09-20 8:20 ` [PATCH v3 0/2] pretty: " Alexey Shumkin
2011-09-20 8:21 ` [PATCH v3 1/2] pretty: Add failing tests: " Alexey Shumkin
2011-09-20 19:12 ` Junio C Hamano
2011-09-20 20:46 ` Alexey Shumkin
2013-01-24 9:10 ` [PATCH v4 0/4] Reroll patches against v1.8.1.1 Alexey Shumkin
2013-06-20 9:26 ` [PATCH v5 0/5] Reroll patches against v1.8.3.1 Alexey Shumkin
2013-06-20 20:10 ` Junio C Hamano
2013-06-25 8:55 ` [PATCH v6 " Alexey Shumkin
2013-06-25 19:28 ` Junio C Hamano
2013-06-26 7:37 ` Alexey Shumkin
2013-06-26 14:24 ` Junio C Hamano
2013-06-26 10:19 ` [PATCH v7 " Alexey Shumkin
2013-06-26 16:19 ` Junio C Hamano
2013-07-01 23:18 ` [PATCH v8 0/5] Reroll patches against Git v1.8.3.2 Alexey Shumkin
2013-07-02 19:41 ` Junio C Hamano
2013-07-03 20:03 ` Alexey Shumkin
2013-07-03 20:06 ` Junio C Hamano
2013-07-04 12:45 ` [PATCH v9 0/5] Incremental updates against 'next' branch Alexey Shumkin
2013-07-05 12:01 ` [PATCH v10 " Alexey Shumkin
2013-07-05 12:01 ` [PATCH v10 1/5] t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1 Alexey Shumkin
2013-07-05 12:01 ` [PATCH v10 2/5] t4205 (log-pretty-formats): revert back single quotes Alexey Shumkin
2013-07-05 12:01 ` [PATCH v10 3/5] t4205, t6006, t7102: make functions better readable Alexey Shumkin
2013-07-05 18:38 ` Junio C Hamano
2013-07-05 18:45 ` Junio C Hamano
2013-07-05 12:01 ` [PATCH v10 4/5] t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commitEncoding is not set Alexey Shumkin
2013-07-05 12:01 ` [PATCH v10 5/5] t4205 (log-pretty-formats): avoid using `sed` Alexey Shumkin
2013-07-04 12:45 ` [PATCH v9 1/5] t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1 Alexey Shumkin
2013-07-05 6:47 ` Junio C Hamano
2013-07-05 8:00 ` Alexey Shumkin
2013-07-05 8:11 ` Junio C Hamano
2013-07-05 8:42 ` Alexey Shumkin
2013-07-05 8:56 ` Junio C Hamano
2013-07-04 12:45 ` [PATCH v9 2/5] t4205: revert back single quotes Alexey Shumkin
2013-07-05 7:07 ` Junio C Hamano
2013-07-04 12:45 ` [PATCH v9 3/5] t4205, t6006, t7102: make functions more readable Alexey Shumkin
2013-07-05 6:45 ` Junio C Hamano
2013-07-05 8:13 ` Alexey Shumkin
2013-07-05 8:44 ` Junio C Hamano
2013-07-05 8:51 ` Alexey Shumkin
2013-07-05 8:58 ` Junio C Hamano
2013-07-04 12:45 ` [PATCH v9 4/5] t6006: add two more tests for the case i18n.commitEncoding is not set Alexey Shumkin
2013-07-05 6:52 ` Junio C Hamano
2013-07-05 7:04 ` Junio C Hamano
2013-07-05 7:46 ` Alexey Shumkin
2013-07-05 8:09 ` Junio C Hamano
2013-07-04 12:45 ` [PATCH v9 5/5] t4205: avoid using `sed` Alexey Shumkin
2013-07-01 23:19 ` [PATCH v8 1/5] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs Alexey Shumkin
2013-07-01 23:19 ` [PATCH v8 2/5] t7102 (reset): " Alexey Shumkin
2013-07-01 23:19 ` [PATCH v8 3/5] t4205 (log-pretty-formats): " Alexey Shumkin
2013-07-01 23:19 ` [PATCH v8 4/5] pretty: Add failing tests: --format output should honor logOutputEncoding Alexey Shumkin
2013-07-02 6:46 ` Johannes Sixt
2013-07-01 23:19 ` [PATCH v8 5/5] pretty: " Alexey Shumkin
2013-06-26 10:19 ` [PATCH v7 1/5] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs Alexey Shumkin
2013-06-26 10:19 ` [PATCH v7 2/5] t7102 (reset): " Alexey Shumkin
2013-06-26 10:19 ` [PATCH v7 3/5] t4205 (log-pretty-formats): " Alexey Shumkin
2013-06-26 10:19 ` [PATCH v7 4/5] pretty: Add failing tests: --format output should honor logOutputEncoding Alexey Shumkin
2013-07-01 7:00 ` Johannes Sixt
2013-07-01 22:50 ` Alexey Shumkin
2013-07-02 7:22 ` Johannes Sixt
2013-07-03 20:20 ` Alexey Shumkin
2013-06-26 10:19 ` [PATCH v7 5/5] pretty: " Alexey Shumkin
2013-06-25 8:55 ` [PATCH v6 1/5] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs Alexey Shumkin
2013-06-25 8:55 ` [PATCH v6 2/5] t7102 (reset): " Alexey Shumkin
2013-06-25 8:55 ` [PATCH v6 3/5] t4205 (log-pretty-formats): " Alexey Shumkin
2013-06-25 8:55 ` [PATCH v6 4/5] pretty: Add failing tests: --format output should honor logOutputEncoding Alexey Shumkin
2013-06-25 8:55 ` [PATCH v6 5/5] pretty: " Alexey Shumkin
2013-06-20 9:26 ` [PATCH v5 1/5] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs Alexey Shumkin
2013-06-20 20:38 ` Junio C Hamano
2013-06-20 9:26 ` [PATCH v5 2/5] t7102 (reset): " Alexey Shumkin
2013-06-20 9:26 ` [PATCH v5 3/5] t4205 (log-pretty-formats): " Alexey Shumkin
2013-06-20 20:38 ` Junio C Hamano
2013-06-20 9:26 ` [PATCH v5 4/5] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting Alexey Shumkin
2013-06-20 20:23 ` Junio C Hamano
2013-06-20 9:26 ` [PATCH v5 5/5] pretty: " Alexey Shumkin
2013-06-20 20:37 ` Junio C Hamano
2013-01-24 9:10 ` [PATCH v4 1/4] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs Alexey Shumkin
2013-01-24 20:29 ` Junio C Hamano
2013-01-25 9:20 ` Alexey Shumkin
2013-01-25 11:06 ` Alexey Shumkin
2013-01-25 15:16 ` Junio C Hamano
2013-01-25 15:27 ` Alexey Shumkin
2013-01-24 9:10 ` [PATCH v4 2/4] t7102 (reset): refactoring: " Alexey Shumkin
2013-01-24 20:30 ` Junio C Hamano
2013-01-25 9:08 ` Alexey Shumkin
2013-01-24 9:10 ` [PATCH v4 3/4] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting Alexey Shumkin
2013-01-24 20:44 ` Junio C Hamano [this message]
2013-01-25 9:07 ` Alexey Shumkin
2013-01-24 21:02 ` Junio C Hamano
2013-01-25 9:01 ` Alexey Shumkin
2013-01-24 9:10 ` [PATCH v4 4/4] pretty: " Alexey Shumkin
2011-09-20 8:21 ` [PATCH v3 2/2] " Alexey Shumkin
2011-09-09 8:53 ` [PATCH " Alexey Shumkin
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=7vr4la9uqo.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=alex.crezoff@gmail.com \
--cc=git@vger.kernel.org \
/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).