diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-03 16:13:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-03 16:13:06 -0800 |
| commit | 9bec60d3a52fa10b276214f8d255d6ff05a04b77 (patch) | |
| tree | 0952a0582193715b67d97de9cf8c0875455bc10d /builtin/mailinfo.c | |
| parent | 45a7b55d6fe69581d12b83f63337eaa1015b6717 (diff) | |
| parent | 7951bd3029a849411181935f84600ddbcd97cd0c (diff) | |
| download | git-9bec60d3a52fa10b276214f8d255d6ff05a04b77.tar.gz | |
Merge branch 'pn/commit-autosquash'
* pn/commit-autosquash:
add tests of commit --squash
commit: --squash option for use with rebase --autosquash
add tests of commit --fixup
commit: --fixup option for use with rebase --autosquash
pretty.c: teach format_commit_message() to reencode the output
commit: helper methods to reduce redundant blocks of code
Conflicts:
Documentation/git-commit.txt
t/t3415-rebase-autosquash.sh
Diffstat (limited to 'builtin/mailinfo.c')
| -rw-r--r-- | builtin/mailinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index 2320d981ce..71e6262a87 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -1032,7 +1032,7 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix) */ git_config(git_mailinfo_config, NULL); - def_charset = (git_commit_encoding ? git_commit_encoding : "UTF-8"); + def_charset = get_commit_output_encoding(); metainfo_charset = def_charset; while (1 < argc && argv[1][0] == '-') { |