mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'rs/clear-commit-marks-in-repo'
Code clean-up. * rs/clear-commit-marks-in-repo: bisect: clear flags in passed repository object: allow clear_commit_marks_all to handle any repo
This commit is contained in:
commit
902f358555
2
bisect.c
2
bisect.c
|
@ -1090,7 +1090,7 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
|
|||
nr), nr, steps_msg);
|
||||
free(steps_msg);
|
||||
/* Clean up objects used, as they will be reused. */
|
||||
clear_commit_marks_all(ALL_REV_FLAGS);
|
||||
repo_clear_commit_marks(r, ALL_REV_FLAGS);
|
||||
|
||||
return bisect_checkout(bisect_rev, no_checkout);
|
||||
}
|
||||
|
|
|
@ -1042,7 +1042,7 @@ static void orphaned_commit_warning(struct commit *old_commit, struct commit *ne
|
|||
describe_detached_head(_("Previous HEAD position was"), old_commit);
|
||||
|
||||
/* Clean up objects used, as they will be reused. */
|
||||
clear_commit_marks_all(ALL_REV_FLAGS);
|
||||
repo_clear_commit_marks(the_repository, ALL_REV_FLAGS);
|
||||
}
|
||||
|
||||
static int switch_branches(const struct checkout_opts *opts,
|
||||
|
|
|
@ -794,7 +794,7 @@ static int should_write_commit_graph(void)
|
|||
|
||||
result = for_each_ref(dfs_on_ref, &data);
|
||||
|
||||
clear_commit_marks_all(SEEN);
|
||||
repo_clear_commit_marks(the_repository, SEEN);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
6
object.c
6
object.c
|
@ -453,12 +453,12 @@ void clear_object_flags(unsigned flags)
|
|||
}
|
||||
}
|
||||
|
||||
void clear_commit_marks_all(unsigned int flags)
|
||||
void repo_clear_commit_marks(struct repository *r, unsigned int flags)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < the_repository->parsed_objects->obj_hash_size; i++) {
|
||||
struct object *obj = the_repository->parsed_objects->obj_hash[i];
|
||||
for (i = 0; i < r->parsed_objects->obj_hash_size; i++) {
|
||||
struct object *obj = r->parsed_objects->obj_hash[i];
|
||||
if (obj && obj->type == OBJ_COMMIT)
|
||||
obj->flags &= ~flags;
|
||||
}
|
||||
|
|
5
object.h
5
object.h
|
@ -191,8 +191,9 @@ void object_array_clear(struct object_array *array);
|
|||
void clear_object_flags(unsigned flags);
|
||||
|
||||
/*
|
||||
* Clear the specified object flags from all in-core commit objects.
|
||||
* Clear the specified object flags from all in-core commit objects from
|
||||
* the specified repository.
|
||||
*/
|
||||
void clear_commit_marks_all(unsigned int flags);
|
||||
void repo_clear_commit_marks(struct repository *r, unsigned int flags);
|
||||
|
||||
#endif /* OBJECT_H */
|
||||
|
|
Loading…
Reference in a new issue