diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-30 23:20:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-31 02:58:43 +0300 |
| commit | 677cfed56ac530878b746ee4cca3ada8af384a81 (patch) | |
| tree | 19b8162432db50d0940067236af6ec8791a9ac03 /builtin-commit-tree.c | |
| parent | 7cbcf4d5579bdc5d9f8a4bf3f37d3390fc6e2572 (diff) | |
commit-tree: cope with different ways "utf-8" can be spelled.
People can spell config.commitencoding differently from what we
internally have ("utf-8") to mean UTF-8. Try to accept them and
treat them equally.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-commit-tree.c')
| -rw-r--r-- | builtin-commit-tree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c index 146aaffd28..0651e5927e 100644 --- a/builtin-commit-tree.c +++ b/builtin-commit-tree.c @@ -119,8 +119,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) } /* Not having i18n.commitencoding is the same as having utf-8 */ - encoding_is_utf8 = (!git_commit_encoding || - !strcmp(git_commit_encoding, "utf-8")); + encoding_is_utf8 = is_encoding_utf8(git_commit_encoding); init_buffer(&buffer, &size); add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1)); |