diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-04-19 09:08:40 +1000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-18 16:28:27 -0700 |
| commit | 5a10d236583f4a674e8fd969c877844c0a9ccb17 (patch) | |
| tree | 42f75dd4a87ae830a9474884b24b26ee341b2e3a /builtin | |
| parent | 1468a5839309033feb2e58943babdd48b8e2d151 (diff) | |
| download | git-5a10d236583f4a674e8fd969c877844c0a9ccb17.tar.gz | |
pretty: save commit encoding from logmsg_reencode if the caller needs it
The commit encoding is parsed by logmsg_reencode, there's no need for
the caller to re-parse it again. The reencoded message now has the new
encoding, not the original one. The caller would need to read commit
object again before parsing.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 2 | ||||
| -rw-r--r-- | builtin/commit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 86100e9662..104a948e0c 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -1425,7 +1425,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); diff --git a/builtin/commit.c b/builtin/commit.c index 46204375e7..d2f30d960a 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -955,7 +955,7 @@ static const char *read_commit_message(const char *name) if (!commit) die(_("could not lookup commit %s"), name); out_enc = get_commit_output_encoding(); - return logmsg_reencode(commit, out_enc); + return logmsg_reencode(commit, NULL, out_enc); } static int parse_and_validate_options(int argc, const char *argv[], |