From 58ecf5c1cd9b2f712f85e23f065d3214cd867a71 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 4 Jul 2006 17:45:22 -0700 Subject: [PATCH] Re-fix clear_commit_marks(). Fix clear_commit_marks() enough to be usable in get_merge_bases(), and retire now unused clear_object_marks(). Signed-off-by: Junio C Hamano --- commit.c | 13 ++++++++----- object.c | 9 --------- object.h | 2 -- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/commit.c b/commit.c index 04390643e..c6bf10d04 100644 --- a/commit.c +++ b/commit.c @@ -397,12 +397,13 @@ void clear_commit_marks(struct commit *commit, unsigned int mark) { struct commit_list *parents; - parents = commit->parents; commit->object.flags &= ~mark; + parents = commit->parents; while (parents) { struct commit *parent = parents->item; - if (parent && parent->object.parsed && - (parent->object.flags & mark)) + + /* Have we already cleared this? */ + if (mark & parent->object.flags) clear_commit_marks(parent, mark); parents = parents->next; } @@ -1083,8 +1084,10 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, } finish: - if (cleanup) - clear_object_marks(PARENT1 | PARENT2 | STALE); + if (cleanup) { + clear_commit_marks(rev1, PARENT1 | PARENT2 | STALE); + clear_commit_marks(rev2, PARENT1 | PARENT2 | STALE); + } return result; } diff --git a/object.c b/object.c index 1c3675971..37277f943 100644 --- a/object.c +++ b/object.c @@ -235,12 +235,3 @@ void add_object_array(struct object *obj, const char *name, struct object_array objects[nr].name = name; array->nr = ++nr; } - -void clear_object_marks(unsigned mark) -{ - int i; - - for (i = 0; i < obj_hash_size; i++) - if (obj_hash[i]) - obj_hash[i]->flags &= ~mark; -} diff --git a/object.h b/object.h index d8a76ea93..e0125e154 100644 --- a/object.h +++ b/object.h @@ -84,6 +84,4 @@ int object_list_contains(struct object_list *list, struct object *obj); /* Object array handling .. */ void add_object_array(struct object *obj, const char *name, struct object_array *array); -void clear_object_marks(unsigned); - #endif /* OBJECT_H */ -- 2.30.2