diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-13 23:38:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-13 23:38:40 -0700 |
| commit | bf6d324e7333f62f6aee56ebb886e82e1f49e1ce (patch) | |
| tree | 946411bff17166b4d30cc7cfec4b8583a05382a7 /fetch-pack.c | |
| parent | 06d30f4f3eea71bce4cf48db3ea384976b3983b7 (diff) | |
| parent | e5a78b1ca8b62aee8567d67f0e0db5ac7706806a (diff) | |
| download | git-bf6d324e7333f62f6aee56ebb886e82e1f49e1ce.tar.gz | |
Merge branch 'lt/unitype' into js/c-merge-recursive
* lt/unitype:
builtin-prune.c: forgot TYPE => OBJ changes.
Remove TYPE_* constant macros and use object_type enums consistently.
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index f2c51ebe4b..b7824dbed4 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -46,7 +46,7 @@ static int rev_list_insert_ref(const char *path, const unsigned char *sha1) { struct object *o = deref_tag(parse_object(sha1), path, 0); - if (o && o->type == TYPE_COMMIT) + if (o && o->type == OBJ_COMMIT) rev_list_push((struct commit *)o, SEEN); return 0; @@ -256,14 +256,14 @@ static int mark_complete(const char *path, const unsigned char *sha1) { struct object *o = parse_object(sha1); - while (o && o->type == TYPE_TAG) { + while (o && o->type == OBJ_TAG) { struct tag *t = (struct tag *) o; if (!t->tagged) break; /* broken repository */ o->flags |= COMPLETE; o = parse_object(t->tagged->sha1); } - if (o && o->type == TYPE_COMMIT) { + if (o && o->type == OBJ_COMMIT) { struct commit *commit = (struct commit *)o; commit->object.flags |= COMPLETE; insert_by_date(commit, &complete); @@ -357,7 +357,7 @@ static int everything_local(struct ref **refs, int nr_match, char **match) * in sync with the other side at some time after * that (it is OK if we guess wrong here). */ - if (o->type == TYPE_COMMIT) { + if (o->type == OBJ_COMMIT) { struct commit *commit = (struct commit *)o; if (!cutoff || cutoff < commit->date) cutoff = commit->date; @@ -376,7 +376,7 @@ static int everything_local(struct ref **refs, int nr_match, char **match) struct object *o = deref_tag(lookup_object(ref->old_sha1), NULL, 0); - if (!o || o->type != TYPE_COMMIT || !(o->flags & COMPLETE)) + if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE)) continue; if (!(o->flags & SEEN)) { |