diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-28 19:03:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-28 19:03:02 -0800 |
| commit | eff73751bb94b0241fd2204effb8680fe9973cbf (patch) | |
| tree | 5fe6f0f55988d64a7b8b841c62b1c996a3fda5bf /environment.c | |
| parent | 013672bc589da395fcba9bf62d699e70f3764689 (diff) | |
| parent | 7255ff0446217ad723dad6088504a18f6afb15db (diff) | |
| download | git-eff73751bb94b0241fd2204effb8680fe9973cbf.tar.xz | |
Merge branch 'jc/utf8'
* jc/utf8:
t3900: test conversion to non UTF-8 as well
Rename t3900 test vector file
UTF-8: introduce i18n.logoutputencoding.
Teach log family --encoding
i18n.logToUTF8: convert commit log message to UTF-8
Move encoding conversion routine out of mailinfo to utf8.c
Conflicts:
commit.c
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/environment.c b/environment.c index f8c7dbcead..a1502c4e87 100644 --- a/environment.c +++ b/environment.c @@ -18,7 +18,8 @@ int prefer_symlink_refs; int log_all_ref_updates; int warn_ambiguous_refs = 1; int repository_format_version; -char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8"; +char *git_commit_encoding; +char *git_log_output_encoding; int shared_repository = PERM_UMASK; const char *apply_default_whitespace; int zlib_compression_level = Z_DEFAULT_COMPRESSION; |