summaryrefslogtreecommitdiff
path: root/fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-16 21:30:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-16 22:16:45 (GMT)
commitd0ac30f20ca1dd1d28a1b84bf13687f09cf535ae (patch)
treeb6e578d050014fed8046d12fc632b2c2f734ac3b /fetch.c
parent28423758591577828672219c1031d463701a11cc (diff)
downloadgit-d0ac30f20ca1dd1d28a1b84bf13687f09cf535ae.zip
git-d0ac30f20ca1dd1d28a1b84bf13687f09cf535ae.tar.gz
git-d0ac30f20ca1dd1d28a1b84bf13687f09cf535ae.tar.bz2
[PATCH] fetch.c: cleanups
Clean-ups suggested by Sergey Vlasov and acked by Daniel Barkalow. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fetch.c')
-rw-r--r--fetch.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/fetch.c b/fetch.c
index 71c4f41..6ee6161 100644
--- a/fetch.c
+++ b/fetch.c
@@ -62,7 +62,8 @@ static int process_tree(struct tree *tree)
return 0;
}
-struct commit_list *complete = NULL;
+#define COMPLETE 1U
+static struct commit_list *complete = NULL;
static int process_commit(struct commit *commit)
{
@@ -70,11 +71,11 @@ static int process_commit(struct commit *commit)
return -1;
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;
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)
{
- struct object *obj = parse_object(sha1);
- while (obj->type == tag_type) {
- obj = ((struct tag *) obj)->tagged;
- parse_object(obj->sha1);
- }
- if (obj->type == commit_type) {
- obj->flags |= 1;
- insert_by_date((struct commit *) obj, &complete);
+ struct commit *commit = lookup_commit_reference_gently(sha1, 1);
+ if (commit) {
+ commit->object.flags |= COMPLETE;
+ insert_by_date(commit, &complete);
}
return 0;
}