{"thread":{"id":"6998","subject":"[PATCH 1/2] Cleanup check_valid in commit-tree.","startedAt":"2007-02-27T15:00:33Z","lastAt":"2007-02-27T15:00:33Z","messageCount":1,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"35678","messageId":"20070227150033.GA3242@spearce.org","threadId":"6998","inReplyTo":null,"subject":"[PATCH 1/2] Cleanup check_valid in commit-tree.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-02-27T15:00:33Z","receivedAt":"2007-02-27T15:00:33Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"This routine should be using the object_type enum rather than a\nstring comparsion, as the expected type is always supplied and is\nknown at compile time.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n\n On top of Nico's cleanups.\n\n builtin-commit-tree.c |   10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin-commit-tree.c b/builtin-commit-tree.c\nindex 04f61d5..4a8d8d8 100644\n--- a/builtin-commit-tree.c\n+++ b/builtin-commit-tree.c\n@@ -45,14 +45,14 @@ static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)\n \tmemcpy(buf + size, one_line, len);\n }\n \n-static void check_valid(unsigned char *sha1, const char *expect)\n+static void check_valid(unsigned char *sha1, enum object_type expect)\n {\n \tenum object_type type = sha1_object_info(sha1, NULL);\n \tif (type < 0)\n \t\tdie(\"%s is not a valid object\", sha1_to_hex(sha1));\n-\tif (expect && type != type_from_string(expect))\n+\tif (type != expect)\n \t\tdie(\"%s is not a valid '%s' object\", sha1_to_hex(sha1),\n-\t\t    expect);\n+\t\t    typename(expect));\n }\n \n /*\n@@ -100,7 +100,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)\n \tif (get_sha1(argv[1], tree_sha1))\n \t\tdie(\"Not a valid object name %s\", argv[1]);\n \n-\tcheck_valid(tree_sha1, tree_type);\n+\tcheck_valid(tree_sha1, OBJ_TREE);\n \tfor (i = 2; i < argc; i += 2) {\n \t\tconst char *a, *b;\n \t\ta = argv[i]; b = argv[i+1];\n@@ -111,7 +111,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)\n \t\t\tdie(\"Too many parents (%d max)\", MAXPARENT);\n \t\tif (get_sha1(b, parent_sha1[parents]))\n \t\t\tdie(\"Not a valid object name %s\", b);\n-\t\tcheck_valid(parent_sha1[parents], commit_type);\n+\t\tcheck_valid(parent_sha1[parents], OBJ_COMMIT);\n \t\tif (new_parent(parents))\n \t\t\tparents++;\n \t}\n-- \n1.5.0.2.775.g1a500\n"}]}