run_diff_{files,index}(): update calling convention.

diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c
index 33c29f7495afad0342545a7e6854c3e3032a69e2..2a818a0a2c218b5b98d82ab0d8be0c65c1edf9c0 100644 (file)
--- a/builtin-commit-tree.c
+++ b/builtin-commit-tree.c
@@ -94,7 +94,6 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
        unsigned int size;
        int encoding_is_utf8;
 
-       setup_ident();
        git_config(git_default_config);
 
        if (argc < 2)
@@ -118,7 +117,8 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
                        parents++;
        }
 
-       encoding_is_utf8 = !strcmp(git_commit_encoding, "utf-8");
+       /* Not having i18n.commitencoding is the same as having 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));