Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()

diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c
index 33c29f7495afad0342545a7e6854c3e3032a69e2..4a8d8d8b674c6f272243a074030af289403eadde 100644 (file)
--- a/builtin-commit-tree.c
+++ b/builtin-commit-tree.c
@@ -45,15 +45,14 @@ static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
        memcpy(buf + size, one_line, len);
 }
 
-static void check_valid(unsigned char *sha1, const char *expect)
+static void check_valid(unsigned char *sha1, enum object_type expect)
 {
-       char type[20];
-
-       if (sha1_object_info(sha1, type, NULL))
+       enum object_type type = sha1_object_info(sha1, NULL);
+       if (type < 0)
                die("%s is not a valid object", sha1_to_hex(sha1));
-       if (expect && strcmp(type, expect))
+       if (type != expect)
                die("%s is not a valid '%s' object", sha1_to_hex(sha1),
-                   expect);
+                   typename(expect));
 }
 
 /*
@@ -94,7 +93,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)
@@ -102,7 +100,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
        if (get_sha1(argv[1], tree_sha1))
                die("Not a valid object name %s", argv[1]);
 
-       check_valid(tree_sha1, tree_type);
+       check_valid(tree_sha1, OBJ_TREE);
        for (i = 2; i < argc; i += 2) {
                const char *a, *b;
                a = argv[i]; b = argv[i+1];
@@ -113,12 +111,13 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
                        die("Too many parents (%d max)", MAXPARENT);
                if (get_sha1(b, parent_sha1[parents]))
                        die("Not a valid object name %s", b);
-               check_valid(parent_sha1[parents], commit_type);
+               check_valid(parent_sha1[parents], OBJ_COMMIT);
                if (new_parent(parents))
                        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));