object: allow clear_commit_marks_all to handle any repo

rscharfe · gitster · commit cd8888452cd0 · 2020-10-31T10:46:34.000-07:00
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 &lt;l.s.r@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -1029,7 +1029,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
@@ -786,7 +786,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
@@ -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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -1090,7 +1090,7 @@ enum bisect_error bisect_next_all(struct repository r, const char prefix)`
`1090`	`1090`	`nr), nr, steps_msg);`
`1091`	`1091`	`free(steps_msg);`
`1092`	`1092`	`/* Clean up objects used, as they will be reused. */`
`1093`		`- clear_commit_marks_all(ALL_REV_FLAGS);`
	`1093`	`+ repo_clear_commit_marks(the_repository, ALL_REV_FLAGS);`
`1094`	`1094`
`1095`	`1095`	`return bisect_checkout(bisect_rev, no_checkout);`
`1096`	`1096`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1029,7 +1029,7 @@ static void orphaned_commit_warning(struct commit old_commit, struct commit ne`
`1029`	`1029`	`describe_detached_head(_("Previous HEAD position was"), old_commit);`
`1030`	`1030`
`1031`	`1031`	`/* Clean up objects used, as they will be reused. */`
`1032`		`- clear_commit_marks_all(ALL_REV_FLAGS);`
	`1032`	`+ repo_clear_commit_marks(the_repository, ALL_REV_FLAGS);`
`1033`	`1033`	`}`
`1034`	`1034`
`1035`	`1035`	`static int switch_branches(const struct checkout_opts *opts,`
Original file line number	Diff line number	Diff line change
`@@ -786,7 +786,7 @@ static int should_write_commit_graph(void)`
`786`	`786`
`787`	`787`	`result = for_each_ref(dfs_on_ref, &data);`
`788`	`788`
`789`		`- clear_commit_marks_all(SEEN);`
	`789`	`+ repo_clear_commit_marks(the_repository, SEEN);`
`790`	`790`
`791`	`791`	`return result;`
`792`	`792`	`}`
Original file line number	Diff line number	Diff line change
`@@ -453,12 +453,12 @@ void clear_object_flags(unsigned flags)`
`453`	`453`	`}`
`454`	`454`	`}`
`455`	`455`
`456`		`-void clear_commit_marks_all(unsigned int flags)`
	`456`	`+void repo_clear_commit_marks(struct repository *r, unsigned int flags)`
`457`	`457`	`{`
`458`	`458`	`int i;`
`459`	`459`
`460`		`- for (i = 0; i < the_repository->parsed_objects->obj_hash_size; i++) {`
`461`		`- struct object *obj = the_repository->parsed_objects->obj_hash[i];`
	`460`	`+ for (i = 0; i < r->parsed_objects->obj_hash_size; i++) {`
	`461`	`+ struct object *obj = r->parsed_objects->obj_hash[i];`
`462`	`462`	`if (obj && obj->type == OBJ_COMMIT)`
`463`	`463`	`obj->flags &= ~flags;`
`464`	`464`	`}`