mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 12:03:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-fix clear_commit_marks().

Browse Source 
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 <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-07-04 17:45:22 -07:00
parent 4205eca8de
commit 58ecf5c1cd
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
commit.c
View File

@ -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;
}

9
object.c
View File

@ -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;
}

2
object.h
View File

@ -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 */