summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-23 18:22:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-23 18:22:48 (GMT)
commite52e6f79ccc372825313890b96007985b8aa6e9c (patch)
tree10fe499658d1df9c12c1658c1bf0e28d32b8ad8d /builtin/blame.c
parent7093d2c0dd986c70a98b712440b34f98599b3539 (diff)
parent1640632b4f3f69775f04e9e40dfd2fd912e0f458 (diff)
downloadgit-e52e6f79ccc372825313890b96007985b8aa6e9c.zip
git-e52e6f79ccc372825313890b96007985b8aa6e9c.tar.gz
git-e52e6f79ccc372825313890b96007985b8aa6e9c.tar.bz2
Merge branch 'nd/pretty-formats'
pretty-printing body of the commit that is stored in non UTF-8 encoding did not work well. The early part of this series fixes it. And then it adds %C(auto) specifier that turns the coloring on when we are emitting to the terminal, and adds column-aligning format directives. * nd/pretty-formats: pretty: support %>> that steal trailing spaces pretty: support truncating in %>, %< and %>< pretty: support padding placeholders, %< %> and %>< pretty: add %C(auto) for auto-coloring pretty: split color parsing into a separate function pretty: two phase conversion for non utf-8 commits utf8.c: add reencode_string_len() that can handle NULs in string utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences utf8.c: move display_mode_esc_sequence_len() for use by other functions pretty: share code between format_decoration and show_decorations pretty-formats.txt: wrap long lines pretty: get the correct encoding for --pretty:format=%e pretty: save commit encoding from logmsg_reencode if the caller needs it
Diffstat (limited to 'builtin/blame.c')
-rw-r--r--builtin/blame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 7770781..57a487e 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1430,7 +1430,7 @@ static void get_commit_info(struct commit *commit,
commit_info_init(ret);
encoding = get_log_output_encoding();
- message = logmsg_reencode(commit, encoding);
+ message = logmsg_reencode(commit, NULL, encoding);
get_ac_line(message, "\nauthor ",
&ret->author, &ret->author_mail,
&ret->author_time, &ret->author_tz);