mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lt/unitype'

Browse Source 
* lt/unitype:
  builtin-prune.c: forgot TYPE => OBJ changes.
  Remove TYPE_* constant macros and use object_type enums consistently.
This commit is contained in:
Junio C Hamano
2006-07-14 15:39:19 -07:00
parent 1733832d8e e5a78b1ca8
commit 5cd060b56c
23 changed files with 90 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
commit.c
View File

@ -56,7 +56,7 @@ static struct commit *check_commit(struct object *obj,
const unsigned char *sha1,
int quiet)
{
if (obj->type != TYPE_COMMIT) {
if (obj->type != OBJ_COMMIT) {
if (!quiet)
error("Object %s is a %s, not a commit",
sha1_to_hex(sha1), typename(obj->type));
@ -86,11 +86,11 @@ struct commit *lookup_commit(const unsigned char *sha1)
if (!obj) {
struct commit *ret = alloc_commit_node();
created_object(sha1, &ret->object);
ret->object.type = TYPE_COMMIT;
ret->object.type = OBJ_COMMIT;
return ret;
}
if (!obj->type)
obj->type = TYPE_COMMIT;
obj->type = OBJ_COMMIT;
return check_commit(obj, sha1, 0);
}