diff options
| author | Nicolas Pitre <nico@cam.org> | 2007-02-26 14:55:59 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-27 01:34:21 -0800 |
| commit | 21666f1aae4e890d8f50924f9e80763b27e6a45d (patch) | |
| tree | 462de5be3e949924f58858e08e24355f613191ab /builtin-commit-tree.c | |
| parent | df8436622fb553f468180b61032fe34bd6712752 (diff) | |
| download | git-21666f1aae4e890d8f50924f9e80763b27e6a45d.tar.gz git-21666f1aae4e890d8f50924f9e80763b27e6a45d.tar.xz | |
convert object type handling from a string to a number
We currently have two parallel notation for dealing with object types
in the code: a string and a numerical value. One of them is obviously
redundent, and the most used one requires more stack space and a bunch
of strcmp() all over the place.
This is an initial step for the removal of the version using a char array
found in object reading code paths. The patch is unfortunately large but
there is no sane way to split it in smaller parts without breaking the
system.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-commit-tree.c')
| -rw-r--r-- | builtin-commit-tree.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c index 2a818a0a2..04f61d510 100644 --- a/builtin-commit-tree.c +++ b/builtin-commit-tree.c @@ -47,11 +47,10 @@ static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...) static void check_valid(unsigned char *sha1, const char *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 (expect && type != type_from_string(expect)) die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect); } |