delta/git.git, branch as/pretty-truncate

pretty.c: format string with truncate respects logOutputEncoding

2014-05-21T18:13:30+00:00

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 (independently of a printed commit
message encoding) but does not work when i18n.logOutputEncoding is NOT
UTF-8.

In 7e77df3 (pretty: two phase conversion for non utf-8 commits, 2013-04-19)
'format_commit_item' function assumes commit message to be in UTF-8.
And that was so until ecaee80 (pretty: --format output should honor
logOutputEncoding, 2013-06-26) where conversion to logOutputEncoding was
added before calling '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 
Reviewed-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

t4205, t6006: add tests that fail with i18n.logOutputEncoding set

2014-05-21T18:11:50+00:00

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 (independently of a printed commit
message encoding) but does not work when i18n.logOutputEncoding is NOT
UTF-8.

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 
Helped-by: Nguyễn Thái Ngọc Duy 
Helped-by: Ramsay Jones 
Signed-off-by: Junio C Hamano

t4205 (log-pretty-format): use `tformat` rather than `format`

2014-05-21T18:10:10+00:00

Use `tformat` to avoid using of `echo` to complete end of line.

Signed-off-by: Alexey Shumkin 
Signed-off-by: Junio C Hamano

t4041, t4205, t6006, t7102: don't hardcode tested encoding value

2014-05-21T18:10:06+00:00

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 
Signed-off-by: Junio C Hamano

t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

2014-05-19T18:24:46+00:00

The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.

That was introduced in a742f2a (t4205 (log-pretty-formats): don't
hardcode SHA-1 in expected outputs, 2013-06-26) but unfortunately was
not followed in 5e1361c (log: properly handle decorations with chained
tags, 2013-12-17)

Signed-off-by: Alexey Shumkin 
Signed-off-by: Junio C Hamano

Merge branch 'fc/prompt-zsh-read-from-file'

2014-05-13T18:53:14+00:00

* fc/prompt-zsh-read-from-file:
  contrib: completion: fix 'eread()' namespace

contrib: completion: fix 'eread()' namespace

2014-05-13T18:52:51+00:00

Otherwise it might collide with a function of the same name in the
user's environment.

Suggested-by: SZEDER Gábor 
Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

Merge git://github.com/git-l10n/git-po

2014-05-12T17:12:05+00:00

* git://github.com/git-l10n/git-po:
  l10n: Updated Bulgarian translation of git (1307t0f921u)

l10n: Updated Bulgarian translation of git (1307t0f921u)

2014-05-11T14:09:01+00:00

Signed-off-by: Alexander Shopov

Git 2.0-rc3

2014-05-09T18:23:55+00:00