[PATCH] fetch.c: cleanups

Clean-ups suggested by Sergey Vlasov and acked by Daniel Barkalow.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2005-09-16 14:30:29 -07:00
parent 2842375859
commit d0ac30f20c
1 changed files with 8 additions and 11 deletions

19
fetch.c
View File

@ -62,7 +62,8 @@ static int process_tree(struct tree *tree)
return 0; return 0;
} }


struct commit_list *complete = NULL; #define COMPLETE 1U
static struct commit_list *complete = NULL;


static int process_commit(struct commit *commit) static int process_commit(struct commit *commit)
{ {
@ -70,11 +71,11 @@ static int process_commit(struct commit *commit)
return -1; return -1;


while (complete && complete->item->date >= commit->date) { while (complete && complete->item->date >= commit->date) {
pop_most_recent_commit(&complete, 1); pop_most_recent_commit(&complete, COMPLETE);
} }


if (commit->object.flags & 1) if (commit->object.flags & COMPLETE)
return 0; return 0;


memcpy(current_commit_sha1, commit->object.sha1, 20); memcpy(current_commit_sha1, commit->object.sha1, 20);
@ -190,14 +191,10 @@ static int interpret_target(char *target, unsigned char *sha1)


static int mark_complete(const char *path, const unsigned char *sha1) static int mark_complete(const char *path, const unsigned char *sha1)
{ {
struct object *obj = parse_object(sha1); struct commit *commit = lookup_commit_reference_gently(sha1, 1);
while (obj->type == tag_type) { if (commit) {
obj = ((struct tag *) obj)->tagged; commit->object.flags |= COMPLETE;
parse_object(obj->sha1); insert_by_date(commit, &complete);
}
if (obj->type == commit_type) {
obj->flags |= 1;
insert_by_date((struct commit *) obj, &complete);
} }
return 0; return 0;
} }