diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-27 16:41:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-27 16:41:33 -0800 |
| commit | d2c11a38c476bdfa3dd2387a0d933b8c00e4dfe3 (patch) | |
| tree | 1b1a4f6c735c576d1d6736ca9031d2e826926a5e /builtin-log.c | |
| parent | 52883fbd767f8a79a6f98a08907d0a9f6ba1ece1 (diff) | |
| download | git-d2c11a38c476bdfa3dd2387a0d933b8c00e4dfe3.tar.gz | |
UTF-8: introduce i18n.logoutputencoding.
It is plausible for somebody to want to view the commit log in a
different encoding from i18n.commitencoding -- the project's
policy may be UTF-8 and the user may be using a commit message
hook to run iconv to conform to that policy (and either not have
i18n.commitencoding to default to UTF-8 or have it explicitly
set to UTF-8). Even then, Latin-1 may be more convenient for
the usual pager and the terminal the user uses.
The new variable i18n.logoutputencoding is used in preference to
i18n.commitencoding to decide what encoding to recode the log
output in when git-log and friends formats the commit log message.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin-log.c b/builtin-log.c index b7e47cb5fe..a59b4acef1 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -33,13 +33,10 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, const char *arg = argv[i]; if (!strncmp(arg, "--encoding=", 11)) { arg += 11; - if (MAX_ENCODING_LENGTH <= strlen(arg)) - die(" Value of output encoding '%s' too long", - arg); if (strcmp(arg, "none")) - strcpy(git_commit_encoding, arg); + git_log_output_encoding = strdup(arg); else - git_commit_encoding[0] = 0; + git_log_output_encoding = ""; } else die("unrecognized argument: %s", arg); |