[PATCH 0/2] Pretty print truncate does not work

2014-05-16 Thread Alexey Shumkin
. Following patches are: 1. failing tests 2. Fix patch Alexey Shumkin (2): t4205 (log-pretty-formats): Add failing tests for the case when i18n.logOutputEncoding is set pretty.c: format string with truncate respects logOutputEncoding pretty.c | 7 +- t/t4205-log-pretty

[PATCH 1/2] t4205 (log-pretty-formats): Add failing tests for the case when i18n.logOutputEncoding is set

2014-05-16 Thread Alexey Shumkin
. There were no breakages as far as were no tests for the case when both a commit message and logOutputEncoding are not UTF-8. Add failing tests for that which will be fixed in the next patch. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4205-log-pretty-formats.sh | 169

[PATCH 2/2] pretty.c: format string with truncate respects logOutputEncoding

2014-05-16 Thread Alexey Shumkin
'format_commit_message'. Correct this by converting a commit message to UTF-8 first (as it assumed in 7e77df3 (pretty: two phase conversion for non utf-8 commits, 2013-04-19)). Only after that set 'output_enc' variable to an actual logOutputEncoding. Signed-off-by: Alexey Shumkin alex.crez

[PATCH v2 0/2] Reroll patch series. Pretty print truncate does not work

2014-05-16 Thread Alexey Shumkin
In this reroll (against v1) remarks of Nguyễn are respected. Comments style changed from C++ to C. variable declaration moved back to the beginning of a function. Also, added tests for the same case for git rev-list (see t6006-rev-list-format.sh) Alexey Shumkin (2): t4205, t6006: Add failing

[PATCH v2 1/2] t4205, t6006: Add failing tests for the case when i18n.logOutputEncoding is set

2014-05-16 Thread Alexey Shumkin
. There were no breakages as far as were no tests for the case when both a commit message and logOutputEncoding are not UTF-8. Add failing tests for that which will be fixed in the next patch. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com Reviewed-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- t

[PATCH v2 2/2] pretty.c: format string with truncate respects logOutputEncoding

2014-05-16 Thread Alexey Shumkin
'format_commit_message'. Correct this by converting a commit message to UTF-8 first (as it assumed in 7e77df3 (pretty: two phase conversion for non utf-8 commits, 2013-04-19)). Only after that convert a commit message to an actual logOutputEncoding. Signed-off-by: Alexey Shumkin alex.crez

Re: [PATCH v2 1/2] t4205, t6006: Add failing tests for the case when i18n.logOutputEncoding is set

2014-05-17 Thread Alexey Shumkin
On Fri, May 16, 2014 at 11:49:40AM -0700, Junio C Hamano wrote: Alexey Shumkin alex.crez...@gmail.com writes: Pretty format string %(N,[ml]trunc)%s truncates subject to a given length with an appropriate padding. This works for non-ASCII texts when i18n.logOutputEncoding is UTF-8 only

[PATCH v3 0/5] Reroll patches. Pretty print truncate does not work

2014-05-19 Thread Alexey Shumkin
m. carlson sand...@crustytoothpaste.net CCed as he committed 5e1361c (log: properly handle decorations with chained tags, 2013-12-17) Alexey Shumkin (5): t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs t4041, t4205, t6006, t7102: Don't hardcode tested encoding value t4205

[PATCH v3 1/5] t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

2014-05-19 Thread Alexey Shumkin
with chained tags, 2013-12-17) Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4205-log-pretty-formats.sh | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 2a6278b..f9f33ae 100755 --- a/t/t4205

[PATCH v3 2/5] t4041, t4205, t6006, t7102: Don't hardcode tested encoding value

2014-05-19 Thread Alexey Shumkin
The tested encoding is always available in a variable. Use it instead of hardcoding. Also, to be in line with other tests use ISO8859-1 (uppercase) rather then iso8895-1. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4041-diff-submodule-option.sh | 7 +-- t/t4205-log-pretty

[PATCH v3 4/5] t4205, t6006: Add failing tests for the case when i18n.logOutputEncoding is set

2014-05-19 Thread Alexey Shumkin
. There were no breakages as far as were no tests for the case when both a commit message and logOutputEncoding are not UTF-8. Add failing tests for that which will be fixed in the next patch. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com Reviewed-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- t

[PATCH v3 5/5] pretty.c: format string with truncate respects logOutputEncoding

2014-05-19 Thread Alexey Shumkin
'format_commit_message'. Correct this by converting a commit message to UTF-8 first (as it assumed in 7e77df3 (pretty: two phase conversion for non utf-8 commits, 2013-04-19)). Only after that convert a commit message to an actual logOutputEncoding. Signed-off-by: Alexey Shumkin alex.crez

Re: [PATCH v3 2/5] t4041, t4205, t6006, t7102: Don't hardcode tested encoding value

2014-05-20 Thread Alexey Shumkin
On Tue, May 20, 2014 at 01:49:31AM +, brian m. carlson wrote: On Mon, May 19, 2014 at 07:28:17PM +0400, Alexey Shumkin wrote: The tested encoding is always available in a variable. Use it instead of hardcoding. Also, to be in line with other tests use ISO8859-1 (uppercase) rather

Re: [PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Alexey Shumkin
${added_utf8_part}gt) foo EOF -test_format complex-subject-commitencoding-unset-ltrunc %($truncate_count,ltrunc)%s EOF +test_format complex-subject-commitencoding-unset-ltrunc %\\($truncate_count,ltrunc\)%s EOF commit $head3 .. of complex bodies commit $head2 -- 1.9.0 -- Alexey

Re: [PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Alexey Shumkin
On Tue, May 20, 2014 at 06:19:36PM +0400, Alexey Shumkin wrote: On Tue, May 20, 2014 at 02:54:20PM +0100, Ramsay Jones wrote: Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Hi Alexey, If you need to re-roll your 'as/pretty-truncate' branch, could you please squash

[PATCH] t6006 (rev-list-format): quote format strings to avoid error on some shells

2014-05-20 Thread Alexey Shumkin
Added in 0a144b3 (t4205, t6006: add failing tests for the case when i18n.logOutputEncoding is set, 2014-05-19) tests give no error (somehow) with Bash as /bin/sh but fail for some other shells. Quote format strings to avoid errors. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com Suggested

Re: [PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Alexey Shumkin
On Tue, May 20, 2014 at 04:01:22PM +0100, Ramsay Jones wrote: On 20/05/14 15:19, Alexey Shumkin wrote: On Tue, May 20, 2014 at 02:54:20PM +0100, Ramsay Jones wrote: Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Hi Alexey, If you need to re-roll your 'as/pretty

Re: [PATCH] t6006-*.sh: Fix truncation tests

2014-05-20 Thread Alexey Shumkin
On Tue, May 20, 2014 at 10:10:46AM -0700, Junio C Hamano wrote: Alexey Shumkin alex.crez...@gmail.com writes: AFAIU, Junio already applied my patches (existance of a branch as/pretty-truncate tells us that). So, we can only send other patches that fix errors brought with former patches

Re: [PATCH] t6006 (rev-list-format): quote format strings to avoid error on some shells

2014-05-21 Thread Alexey Shumkin
This patch is redundant then. It will be squashed into next patch series. On Tue, May 20, 2014 at 06:48:43PM +0400, Alexey Shumkin wrote: Added in 0a144b3 (t4205, t6006: add failing tests for the case when i18n.logOutputEncoding is set, 2014-05-19) tests give no error (somehow) with Bash

[PATCH v4 1/5] t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

2014-05-21 Thread Alexey Shumkin
with chained tags, 2013-12-17) Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4205-log-pretty-formats.sh | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 2a6278b..f9f33ae 100755 --- a/t/t4205

[PATCH v4 0/5] Reroll patches. Pretty print truncate does not work

2014-05-21 Thread Alexey Shumkin
This version (v4) differs from the previuos (v3): 1. Fixed typo ISO8895-1 (vs ISO8859-1) 2. Fixed t4205 test: tested format strings are double-quoted Alexey Shumkin (5): t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs t4041, t4205, t6006, t7102: Don't hardcode tested

[PATCH v4 4/5] t4205, t6006: Add failing tests for the case when i18n.logOutputEncoding is set

2014-05-21 Thread Alexey Shumkin
. There were no breakages as far as were no tests for the case when both a commit message and logOutputEncoding are not UTF-8. Add failing tests for that which will be fixed in the next patch. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com Reviewed-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Reviewed

[PATCH v4 5/5] pretty.c: format string with truncate respects logOutputEncoding

2014-05-21 Thread Alexey Shumkin
'format_commit_message'. Correct this by converting a commit message to UTF-8 first (as it assumed in 7e77df3 (pretty: two phase conversion for non utf-8 commits, 2013-04-19)). Only after that convert a commit message to an actual logOutputEncoding. Signed-off-by: Alexey Shumkin alex.crez

[PATCH v4 2/5] t4041, t4205, t6006, t7102: Don't hardcode tested encoding value

2014-05-21 Thread Alexey Shumkin
The tested encoding is always available in a variable. Use it instead of hardcoding. Also, to be in line with other tests use ISO8859-1 (uppercase) rather then iso8859-1. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4041-diff-submodule-option.sh | 7 +-- t/t4205-log-pretty

[PATCH v4 3/5] t4205 (log-pretty-format): Use `tformat` rather than `format`

2014-05-21 Thread Alexey Shumkin
Use `tformat` to avoid using of `echo` to complete end of line. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4205-log-pretty-formats.sh | 52 +++ 1 file changed, 13 insertions(+), 39 deletions(-) diff --git a/t/t4205-log-pretty-formats.sh b

Re: [PATCH 2/3] hooks/post-receive-email: force log messages in UTF-8

2013-08-04 Thread Alexey Shumkin
--pretty=oneline $oldrev + git diff-tree -s --always --encoding=UTF-8 --pretty=oneline $oldrev echo $LOGEND } -- 1.8.4.rc1 -- Alexey Shumkin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [PATCH 2/3] hooks/post-receive-email: force log messages in UTF-8

2013-08-05 Thread Alexey Shumkin
On Sun, Aug 04, 2013 at 11:14:40AM -0700, Jonathan Nieder wrote: Alexey Shumkin wrote: On Fri, Aug 02, 2013 at 04:23:38PM -0700, Jonathan Nieder wrote: 1. Log messages use the configured log output encoding, which is meant to be whatever encoding works best with local terminals

Git bug. make [all] does not use USE_LIBPCRE when configure --with-libpcre was previously run

2013-08-14 Thread Alexey Shumkin
to. -- Alexey Shumkin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Git bug. make [all] does not use USE_LIBPCRE when configure --with-libpcre was previously run

2013-08-15 Thread Alexey Shumkin
error occured. Thank you! -- Alexey Shumkin -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v5 0/5] Reroll patches against v1.8.3.1

2013-06-20 Thread Alexey Shumkin
Alexey Shumkin (5): t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs t7102 (reset): don't hardcode SHA-1 in expected outputs t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs pretty: Add failing tests: user format ignores i18n.logOutputEncoding

[PATCH v5 1/5] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-06-20 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t6006-rev-list-format.sh | 142 + 1 file changed, 79 insertions(+), 63 deletions(-) diff --git a/t

[PATCH v5 3/5] t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

2013-06-20 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4205-log-pretty-formats.sh | 48 +++ 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/t

[PATCH v5 5/5] pretty: user format ignores i18n.logOutputEncoding setting

2013-06-20 Thread Alexey Shumkin
HEAD and $ git reset --hard Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- builtin/reset.c | 8 ++-- builtin/rev-list.c | 1 + builtin/shortlog.c | 1 + log-tree.c | 1 + submodule.c | 3

[PATCH v5 2/5] t7102 (reset): don't hardcode SHA-1 in expected outputs

2013-06-20 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t7102-reset.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index df82ec9

[PATCH v5 4/5] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting

2013-06-20 Thread Alexey Shumkin
HEAD and $ git reset --hard Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4041-diff-submodule-option.sh | 35 + t/t4205-log-pretty-formats.sh| 149 --- t/t6006-rev-list-format.sh | 85 +++--- t/t7102

[PATCH v6 2/5] t7102 (reset): don't hardcode SHA-1 in expected outputs

2013-06-25 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t7102-reset.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index df82ec9

[PATCH v6 0/5] Reroll patches against v1.8.3.1

2013-06-25 Thread Alexey Shumkin
v6 5/5] pretty: --format output should honor logOutputEncoding reworded log message Alexey Shumkin (5): t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs t7102 (reset): don't hardcode SHA-1 in expected outputs t4205 (log-pretty-formats): don't hardcode SHA-1

[PATCH v6 5/5] pretty: --format output should honor logOutputEncoding

2013-06-25 Thread Alexey Shumkin
not when it formats %s. The same corruption is true for $ git diff --submodule=log and $ git rev-list --pretty=format:%s HEAD and $ git reset --hard This patch makes pretty --format honor logOutputEncoding when it formats log message. Signed-off-by: Alexey Shumkin

[PATCH v6 4/5] pretty: Add failing tests: --format output should honor logOutputEncoding

2013-06-25 Thread Alexey Shumkin
it formats %s. The same corruption is true for $ git diff --submodule=log and $ git rev-list --pretty=format:%s HEAD and $ git reset --hard This patch adds failing tests for the next patch that fixes them. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4041-diff

[PATCH v6 1/5] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-06-25 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t6006-rev-list-format.sh | 140 + 1 file changed, 77 insertions(+), 63 deletions(-) diff --git a/t

[PATCH v6 3/5] t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

2013-06-25 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4205-log-pretty-formats.sh | 48 +++ 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/t

Re: [PATCH v6 0/5] Reroll patches against v1.8.3.1

2013-06-26 Thread Alexey Shumkin
On Tue, Jun 25, 2013 at 12:28:02PM -0700, Junio C Hamano wrote: Alexey Shumkin alex.crez...@gmail.com writes: 4. [PATCH v6 4/5] pretty: Add failing tests: --format output should honor logOutputEncoding iso8859-5 encoding reverted back to cp1251 encoding (as it was in v4 series

[PATCH v7 1/5] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-06-26 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t6006-rev-list-format.sh | 140 + 1 file changed, 77 insertions(+), 63 deletions(-) diff --git a/t

[PATCH v7 0/5] Reroll patches against v1.8.3.1

2013-06-26 Thread Alexey Shumkin
; to avoid compiler warning on the line logmsg_free(msg, commit); P.S. It's all started here [http://thread.gmane.org/gmane.comp.version-control.git/177634] Alexey Shumkin (5): t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs t7102 (reset): don't hardcode SHA-1 in expected

[PATCH v7 2/5] t7102 (reset): don't hardcode SHA-1 in expected outputs

2013-06-26 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t7102-reset.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index df82ec9

[PATCH v7 3/5] t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

2013-06-26 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4205-log-pretty-formats.sh | 48 +++ 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/t

[PATCH v7 5/5] pretty: --format output should honor logOutputEncoding

2013-06-26 Thread Alexey Shumkin
not when it formats %s. The same corruption is true for $ git diff --submodule=log and $ git rev-list --pretty=format:%s HEAD and $ git reset --hard This patch makes pretty --format honor logOutputEncoding when it formats log message. Signed-off-by: Alexey Shumkin

[PATCH v7 4/5] pretty: Add failing tests: --format output should honor logOutputEncoding

2013-06-26 Thread Alexey Shumkin
it formats %s. The same corruption is true for $ git diff --submodule=log and $ git rev-list --pretty=format:%s HEAD and $ git reset --hard This patch adds failing tests for the next patch that fixes them. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4041-diff

Re: [PATCH v7 4/5] pretty: Add failing tests: --format output should honor logOutputEncoding

2013-07-01 Thread Alexey Shumkin
On Mon, Jul 01, 2013 at 09:00:55AM +0200, Johannes Sixt wrote: Am 6/26/2013 12:19, schrieb Alexey Shumkin: One can set an alias $ git config alias.lg log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cd) %C(bold blue)%an%Creset' --abbrev-commit

[PATCH v8 2/5] t7102 (reset): don't hardcode SHA-1 in expected outputs

2013-07-01 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t7102-reset.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index df82ec9

[PATCH v8 1/5] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-07-01 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t6006-rev-list-format.sh | 140 + 1 file changed, 77 insertions(+), 63 deletions(-) diff --git a/t

[PATCH v8 0/5] Reroll patches against Git v1.8.3.2

2013-07-01 Thread Alexey Shumkin
: `commit_msg` function become more readable 5. [PATCH v8 5/5] pretty: --format output should honor logOutputEncoding untouched P.S. It's all started here [http://thread.gmane.org/gmane.comp.version-control.git/177634] Alexey Shumkin (5): t6006 (rev-list-format): don't hardcode SHA-1

[PATCH v8 3/5] t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

2013-07-01 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4205-log-pretty-formats.sh | 48 +++ 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/t

[PATCH v8 5/5] pretty: --format output should honor logOutputEncoding

2013-07-01 Thread Alexey Shumkin
not when it formats %s. The same corruption is true for $ git diff --submodule=log and $ git rev-list --pretty=format:%s HEAD and $ git reset --hard This patch makes pretty --format honor logOutputEncoding when it formats log message. Signed-off-by: Alexey Shumkin

[PATCH v8 4/5] pretty: Add failing tests: --format output should honor logOutputEncoding

2013-07-01 Thread Alexey Shumkin
it formats %s. The same corruption is true for $ git diff --submodule=log and $ git rev-list --pretty=format:%s HEAD and $ git reset --hard This patch adds failing tests for the next patch that fixes them. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t4041-diff

Re: [PATCH v8 0/5] Reroll patches against Git v1.8.3.2

2013-07-03 Thread Alexey Shumkin
On Tue, Jul 02, 2013 at 12:41:03PM -0700, Junio C Hamano wrote: Alexey Shumkin alex.crez...@gmail.com writes: v8 of this patch series includes the following changes against v7: Oops, isn't this already in 'next'? In that case, please feed incremental updates on top of the patches

Re: [PATCH v7 4/5] pretty: Add failing tests: --format output should honor logOutputEncoding

2013-07-03 Thread Alexey Shumkin
On Tue, Jul 02, 2013 at 09:22:09AM +0200, Johannes Sixt wrote: Am 7/2/2013 0:50, schrieb Alexey Shumkin: On Mon, Jul 01, 2013 at 09:00:55AM +0200, Johannes Sixt wrote: Am 6/26/2013 12:19, schrieb Alexey Shumkin: test_expect_success 'setup complex body' ' git config i18n.commitencoding

Re: [PATCH] t4205: don't rely on en_US.UTF-8 locale existing

2013-07-03 Thread Alexey Shumkin
CC this to Johannes Sixt On Wed, Jul 03, 2013 at 09:18:08PM +0100, John Keeping wrote: My system doesn't have the en_US.UTF-8 locale (or plain en_US), which causes t4205 to fail by counting bytes instead of UTF-8 codepoints. Instead of using sed for this, use Perl which behaves predictably

Re: [PATCH] t4205: don't rely on en_US.UTF-8 locale existing

2013-07-03 Thread Alexey Shumkin
http://thread.gmane.org/gmane.comp.version-control.git/229291 this is why CCed CC this to Johannes Sixt On Wed, Jul 03, 2013 at 09:18:08PM +0100, John Keeping wrote: My system doesn't have the en_US.UTF-8 locale (or plain en_US), which causes t4205 to fail by counting bytes instead of

Re: [PATCH] t4205: don't rely on en_US.UTF-8 locale existing

2013-07-03 Thread Alexey Shumkin
On Wed, Jul 03, 2013 at 02:41:06PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: My system doesn't have the en_US.UTF-8 locale (or plain en_US), which causes t4205 to fail by counting bytes instead of UTF-8 codepoints. Instead of using sed for this, use Perl which

Re: [PATCH] t4205: don't rely on en_US.UTF-8 locale existing

2013-07-03 Thread Alexey Shumkin
On Wed, Jul 03, 2013 at 10:53:03PM +0100, John Keeping wrote: On Wed, Jul 03, 2013 at 02:41:06PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: My system doesn't have the en_US.UTF-8 locale (or plain en_US), which causes t4205 to fail by counting bytes instead of

[PATCH v9 0/5] Incremental updates against 'next' branch

2013-07-04 Thread Alexey Shumkin
This patch series is an incremental updates on top of (7c375214 t4205: replace .\+ with ..* in sed commands, 2013-07-01) as far as v7 patches were applied to the 'next' branch but there were more improvements made in v8. Alexey Shumkin (5): t4041, t4205, t6006, t7102: use iso8859-1 rather than

[PATCH v9 3/5] t4205, t6006, t7102: make functions more readable

2013-07-04 Thread Alexey Shumkin
Function 'test_format' is become hard to read after its change in de6029a2d7734a93a9e27b9c4471862a47dd8123. So, make it more elegant. Also, change 'commit_msg' function to make it more pretty. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com Improved-by: Johannes Sixt j.s...@viscovery.net

[PATCH v9 1/5] t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1

2013-07-04 Thread Alexey Shumkin
This is actually a fixup of de6029a2d7734a93a9e27b9c4471862a47dd8123, which was applied before final patch series was sent. Also, see 3994e8a98dc7bbf67e61d23c8125f44383499a1f for the explanation of such a replacement. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com Reviewed-by: Johannes

[PATCH v9 4/5] t6006: add two more tests for the case i18n.commitEncoding is not set

2013-07-04 Thread Alexey Shumkin
In de6029a2d7734a93a9e27b9c4471862a47dd8123 'complex-subject' test was changed. Revert it back, and add two more tests to test encoding conversions with no i18n.commitEncoding set. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com Reviewed-by: Johannes Sixt j.s...@viscovery.net --- t/t6006

[PATCH v9 5/5] t4205: avoid using `sed`

2013-07-04 Thread Alexey Shumkin
For testing truncated log messages 'commit_msg' function uses `sed` to cut a message. On various platforms `sed` behaves differently and results of its work depend on locales installed. So, avoid using `sed`. Use predefined expected outputs instead of calculated ones. Signed-off-by: Alexey

[PATCH v9 2/5] t4205: revert back single quotes

2013-07-04 Thread Alexey Shumkin
In previuos commit de6029a2d7734a93a9e27b9c4471862a47dd8123 single quotes were replaced with double quotes to make $(commit_msg) expression in heredoc to work. The same effect can be achieved by using EOF as a heredoc delimiter instead of \EOF. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com

Re: [PATCH v9 4/5] t6006: add two more tests for the case i18n.commitEncoding is not set

2013-07-05 Thread Alexey Shumkin
On Fri, Jul 05, 2013 at 12:04:34AM -0700, Junio C Hamano wrote: Alexey Shumkin alex.crez...@gmail.com writes: +test_format complex-body %b EOF +commit $head3 +This commit message is much longer than the others, +and it will be encoded in iso8859-1. We should therefore +include

Re: [PATCH v9 1/5] t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1

2013-07-05 Thread Alexey Shumkin
On Thu, Jul 04, 2013 at 11:47:04PM -0700, Junio C Hamano wrote: Alexey Shumkin alex.crez...@gmail.com writes: This is actually a fixup of de6029a2d7734a93a9e27b9c4471862a47dd8123, which was applied before final patch series was sent. Also, see 3994e8a98dc7bbf67e61d23c8125f44383499a1f

Re: [PATCH v9 3/5] t4205, t6006, t7102: make functions more readable

2013-07-05 Thread Alexey Shumkin
On Thu, Jul 04, 2013 at 11:45:57PM -0700, Junio C Hamano wrote: Alexey Shumkin alex.crez...@gmail.com writes: Function 'test_format' is become hard to read after its change in de6029a2d7734a93a9e27b9c4471862a47dd8123. So, make it more elegant. Also, change 'commit_msg' function to make

Re: [PATCH v9 1/5] t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1

2013-07-05 Thread Alexey Shumkin
On Fri, Jul 05, 2013 at 01:11:49AM -0700, Junio C Hamano wrote: Alexey Shumkin alex.crez...@gmail.com writes: Both iso8859-1 and iso-8859-1 are understood as latin-1 by modern platforms, but the latter is not understood by older platforms;update tests to use the former

Re: [PATCH v9 3/5] t4205, t6006, t7102: make functions more readable

2013-07-05 Thread Alexey Shumkin
On Fri, Jul 05, 2013 at 01:44:07AM -0700, Junio C Hamano wrote: Alexey Shumkin alex.crez...@gmail.com writes: Perhaps like this. Function 'test_format' has become harder to read after its change in de6029a2 (pretty: Add failing tests: --format output should honor

[PATCH v10 2/5] t4205 (log-pretty-formats): revert back single quotes

2013-07-05 Thread Alexey Shumkin
. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com Suggested-by: Johannes Sixt j.s...@viscovery.net --- t/t4205-log-pretty-formats.sh | 106 +- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log

[PATCH v10 5/5] t4205 (log-pretty-formats): avoid using `sed`

2013-07-05 Thread Alexey Shumkin
For testing truncated log messages 'commit_msg' function uses `sed` to cut a message. On various platforms `sed` behaves differently and results of its work depend on locales installed. So, avoid using `sed`. Use predefined expected outputs instead of calculated ones. Signed-off-by: Alexey

[PATCH v10 0/5] Incremental updates against 'next' branch

2013-07-05 Thread Alexey Shumkin
is an incremental updates on top of (7c375214 t4205: replace .\+ with ..* in sed commands, 2013-07-01) as far as v7 patches were applied to the 'next' branch but there were more improvements made in v8. Alexey Shumkin (5): t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1 t4205 (log-pretty

[PATCH v10 4/5] t6006 (rev-list-format): add tests for %b and %s for the case i18n.commitEncoding is not set

2013-07-05 Thread Alexey Shumkin
to test encoding conversions with no i18n.commitEncoding set. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com Suggested-by: Johannes Sixt j.s...@viscovery.net --- t/t6006-rev-list-format.sh | 41 - 1 file changed, 28 insertions(+), 13 deletions(-) diff

[PATCH v10 3/5] t4205, t6006, t7102: make functions better readable

2013-07-05 Thread Alexey Shumkin
as far as there are no tests expected to fail. We can keep that for future use. Also, reformat comments Signed-off-by: Alexey Shumkin alex.crez...@gmail.com Improved-by: Johannes Sixt j.s...@viscovery.net --- t/t4205-log-pretty-formats.sh | 3 ++- t/t6006-rev-list-format.sh| 28

[PATCH v10 1/5] t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1

2013-07-05 Thread Alexey Shumkin
Both iso8859-1 and iso-8859-1 are understood as latin-1 by modern platforms, but the latter is not understood by older platforms; update tests to use the former. This is in line with 3994e8a9 (t4201: use ISO8859-1 rather than ISO-8859-1, 2009-12-03), which did the same. Signed-off-by: Alexey

[PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool

2013-01-23 Thread Alexey Shumkin
Options are taken from Git source/mergetools/vim Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- git-gui/lib/mergetool.tcl | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index 3c8e73b..4fc1cab 100644

[PATCH 2/3] mergetool--lib: Add diffuse as a tool

2013-01-23 Thread Alexey Shumkin
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- git-gui/lib/mergetool.tcl | 9 + 1 file changed, 9 insertions(+) diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index 4fc1cab..837ce17 100644 --- a/git-gui/lib/mergetool.tcl +++ b/git-gui/lib/mergetool.tcl

[PATCH 3/3] mergetool--lib: Add TortoiseMerge as a tool

2013-01-23 Thread Alexey Shumkin
Also added Russian translation of the added error message %s cannot be used without a base Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- git-gui/lib/mergetool.tcl | 10 ++ git-gui/po/ru.po | 4 2 files changed, 14 insertions(+) diff --git a/git-gui/lib

[PATCH v4 0/4] Reroll patches against v1.8.1.1

2013-01-24 Thread Alexey Shumkin
Wf! Reroll my patches again after 1.5 years ;) They must be applied against v1.8.1.1 Sorry for my laziness ;) Alexey Shumkin (4): t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs t7102 (reset): refactoring: don't hardcode SHA-1 in expected outputs pretty: Add failing

[PATCH v4 1/4] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-01-24 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t6006-rev-list-format.sh | 130 + 1 file changed, 72 insertions(+), 58 deletions(-) diff --git

[PATCH v4 2/4] t7102 (reset): refactoring: don't hardcode SHA-1 in expected outputs

2013-01-24 Thread Alexey Shumkin
The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t7102-reset.sh | 41 + 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/t/t7102

[PATCH v4 3/4] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting

2013-01-24 Thread Alexey Shumkin
HEAD and $ git reset --hard Signed-off-by: Alexey Shumkin alex.crez...@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

Re: [PATCH] send-email: Honor multi-part email messages

2013-01-24 Thread Alexey Shumkin
Bump -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool

2013-01-25 Thread Alexey Shumkin
applying them every time after each Git update as I did last 1.5 years with other patches which still are not submitted, because I'm too lazy to follow Git development workflow in my free time ) On Wed, Jan 23, 2013 at 11:16 PM, Alexey Shumkin alex.crez...@gmail.com wrote: Options are taken from

Re: [PATCH v4 3/4] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting

2013-01-25 Thread Alexey Shumkin
Alexey Shumkin alex.crez...@gmail.com writes: diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index c248509..4db43a4 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh ... @@ -112,12 +133,12 @@ commit $head2 commit $head1 EOF

Re: [PATCH v4 3/4] pretty: Add failing tests: user format ignores i18n.logOutputEncoding setting

2013-01-25 Thread Alexey Shumkin
Alexey Shumkin alex.crez...@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

Re: [PATCH v4 2/4] t7102 (reset): refactoring: don't hardcode SHA-1 in expected outputs

2013-01-25 Thread Alexey Shumkin
Alexey Shumkin alex.crez...@gmail.com writes: The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- Looks good ( refactoring: in the title may not want to be there, though). oops

Re: [PATCH v4 1/4] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-01-25 Thread Alexey Shumkin
Alexey Shumkin alex.crez...@gmail.com writes: The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t6006-rev-list-format.sh | 130 + 1

Re: [PATCH v4 1/4] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-01-25 Thread Alexey Shumkin
Why do we want whatever_7 variables and use cut -c1-7 to produce them? Is 7 something we care deeply about? I think what we care a lot more than 7 that happens to be the current default value is to make sure that, if we ever update the default abbreviation length to a larger value, the

[PATCH] git-web--browser: avoid errors in terminal when running Firefox on Windows

2013-01-25 Thread Alexey Shumkin
-by: Alexey Shumkin alex.crez...@gmail.com Reviewed-by: Jeff King p...@peff.net --- git-web--browse.sh | 2 +- t/t9901-git-web--browse.sh | 57 +- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/git-web--browse.sh b/git-web

Re: [PATCH v4 1/4] t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs

2013-01-25 Thread Alexey Shumkin
Alexey Shumkin alex.crez...@gmail.com writes: Why do we want whatever_7 variables and use cut -c1-7 to produce them? Is 7 something we care deeply about? I think what we care a lot more than 7 that happens to be the current default value is to make sure that, if we ever update

[PATCH] send-email: Honor multi-part email messages

2013-01-25 Thread Alexey Shumkin
messages. So already quoted printable email subject may be encoded as quoted printable again. Due to this bug email subject looks corrupted in email clients. Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- git-send-email.perl | 5 t/t9001-send-email.sh | 66

[PATCH v2 0/2] git-web--browser: avoid errors in terminal when running

2013-01-25 Thread Alexey Shumkin
Reroll patch after all suggestions Alexey Shumkin (2): t9901-git-web--browse.sh: Use write_script helper git-web--browser: avoid errors in terminal when running Firefox on Windows git-web--browse.sh | 2 +- t/t9901-git-web--browse.sh | 59

[PATCH v2 1/2] t9901-git-web--browse.sh: Use write_script helper

2013-01-25 Thread Alexey Shumkin
Use write_script helper as suggested by Junio C Hamano. Also, replace `pwd` with $(pwd) call convention. Suggested-by: Junio C Hamano gits...@pobox.com Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- t/t9901-git-web--browse.sh | 6 ++ 1 file changed, 2 insertions(+), 4 deletions

[PATCH v2 2/2] git-web--browser: avoid errors in terminal when running Firefox on Windows

2013-01-25 Thread Alexey Shumkin
-by: Alexey Shumkin alex.crez...@gmail.com Reviewed-by: Jeff King p...@peff.net --- git-web--browse.sh | 2 +- t/t9901-git-web--browse.sh | 53 +- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/git-web--browse.sh b/git-web

Re: [PATCH 0/7] contrib/subtree: Testsuite cleanup

2015-11-13 Thread Alexey Shumkin
> contrib/subtree/git-subtree.sh |2 +- > contrib/subtree/t/Makefile | 31 +- > contrib/subtree/t/t7900-subtree.sh | 1366 +-- > 3 files changed, 956 insertions(+), 443 deletions(-) > -- Alexey Shumkin E-mail: alex.crez...@gmail.com -- T

Re: [PATCH v1 0/2] contrib/subtree: make it respect spaces in a repository path

2015-09-07 Thread Alexey Shumkin
On Fri, Sep 04, 2015 at 04:08:06PM -0700, Junio C Hamano wrote: > Alexey Shumkin <alex.crez...@gmail.com> writes: > > > Some repositories may have spaces in their paths. Currently `git-subtree` > > raises an error in such cases. > > Also, `git-subtree` currently doe

  1   2   >