summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-03 16:13:06 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-03 16:13:06 -0800
commit9bec60d3a52fa10b276214f8d255d6ff05a04b77 (patch)
tree0952a0582193715b67d97de9cf8c0875455bc10d /environment.c
parent45a7b55d6fe69581d12b83f63337eaa1015b6717 (diff)
parent7951bd3029a849411181935f84600ddbcd97cd0c (diff)
downloadgit-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 'environment.c')
-rw-r--r--environment.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 92e16b19b2..76e4dee273 100644
--- a/environment.c
+++ b/environment.c
@@ -193,3 +193,14 @@ int set_git_dir(const char *path)
setup_git_env();
return 0;
}
+
+const char *get_log_output_encoding(void)
+{
+ return git_log_output_encoding ? git_log_output_encoding
+ : get_commit_output_encoding();
+}
+
+const char *get_commit_output_encoding(void)
+{
+ return git_commit_encoding ? git_commit_encoding : "UTF-8";
+}