* [PATCH v2 1/2] object: allow clear_commit_marks_all to handle any repo
@ 2020-10-31 12:46 René Scharfe
2020-10-31 12:47 ` [PATCH v2 2/2] bisect: clear flags in passed repository René Scharfe
0 siblings, 1 reply; 2+ messages in thread
From: René Scharfe @ 2020-10-31 12:46 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano
Allow callers to specify the repository to use. Rename the function to
repo_clear_commit_marks to document its new scope. No functional change
intended.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
Changes from v1: Renamed the function; the "_all" part became misleading
when it became possible to represent multiple repositories, but the
function was still only operating on one of them.
bisect.c | 2 +-
builtin/checkout.c | 2 +-
builtin/gc.c | 2 +-
object.c | 6 +++---
object.h | 5 +++--
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/bisect.c b/bisect.c
index f5b1368128..3b763dab6b 100644
--- a/bisect.c
+++ b/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(the_repository, ALL_REV_FLAGS);
return bisect_checkout(bisect_rev, no_checkout);
}
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 7c311cecb3..9b82119129 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -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,
diff --git a/builtin/gc.c b/builtin/gc.c
index 2b99596ec8..4ff1894810 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -788,7 +788,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;
}
diff --git a/object.c b/object.c
index 3257518656..05544bc92b 100644
--- a/object.c
+++ b/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;
}
diff --git a/object.h b/object.h
index 20b18805f0..59daadce21 100644
--- a/object.h
+++ b/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 */
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2 2/2] bisect: clear flags in passed repository
2020-10-31 12:46 [PATCH v2 1/2] object: allow clear_commit_marks_all to handle any repo René Scharfe
@ 2020-10-31 12:47 ` René Scharfe
0 siblings, 0 replies; 2+ messages in thread
From: René Scharfe @ 2020-10-31 12:47 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano, Nguyễn Thái Ngọc Duy
69d2cfe6e8 (bisect.c: remove the_repository reference, 2018-11-10) kept
the implicit the_repository reference in clear_commit_marks_all, which
was made explicit by the previous commit (and which also renamed it to
repo_clear_commit_marks). Replace it as well.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
bisect.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bisect.c b/bisect.c
index 3b763dab6b..58bc9c73a4 100644
--- a/bisect.c
+++ b/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. */
- repo_clear_commit_marks(the_repository, ALL_REV_FLAGS);
+ repo_clear_commit_marks(r, ALL_REV_FLAGS);
return bisect_checkout(bisect_rev, no_checkout);
}
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-31 12:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-31 12:46 [PATCH v2 1/2] object: allow clear_commit_marks_all to handle any repo René Scharfe
2020-10-31 12:47 ` [PATCH v2 2/2] bisect: clear flags in passed repository René Scharfe
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).