diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-15 18:24:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-15 18:24:05 (GMT) |
| commit | 6b8731258d06001217254ef67a3553d3fe601737 (patch) | |
| tree | 8f31842c4331b0bfc784453df25955b9718b0029 /sequencer.c | |
| parent | a1b3293936e3ee3a431051d12744876e4f5b21eb (diff) | |
| parent | 0e18bcd5e937b9e5857892e7f5c80c3c5b1da5d4 (diff) | |
| download | git-6b8731258d06001217254ef67a3553d3fe601737.zip git-6b8731258d06001217254ef67a3553d3fe601737.tar.gz git-6b8731258d06001217254ef67a3553d3fe601737.tar.bz2 | |
Merge branch 'jc/same-encoding'
Various codepaths checked if two encoding names are the same using
ad-hoc code and some of them ended up asking iconv() to convert
between "utf8" and "UTF-8". The former is not a valid way to spell
the encoding name, but often people use it by mistake, and we
equated them in some but not all codepaths. Introduce a new helper
function to make these codepaths consistent.
* jc/same-encoding:
reencode_string(): introduce and use same_encoding()
Conflicts:
builtin/mailinfo.c
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index be0cb8b..2260490 100644 --- a/sequencer.c +++ b/sequencer.c @@ -60,7 +60,7 @@ static int get_message(struct commit *commit, struct commit_message *out) out->reencoded_message = NULL; out->message = commit->buffer; - if (strcmp(encoding, git_commit_encoding)) + if (same_encoding(encoding, git_commit_encoding)) out->reencoded_message = reencode_string(commit->buffer, git_commit_encoding, encoding); if (out->reencoded_message) |