refs: allow for_each_replace_ref to handle arbitrary repositories

stefanbeller · gitster · commit 0d296c57aec3 · 2018-04-12T11:38:56.000+09:00
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/refs.c b/refs.c
@@ -1415,9 +1415,9 @@ int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
 	return do_for_each_ref(refs, prefix, fn, 0, flag, cb_data);
 }
 
-int for_each_replace_ref_the_repository(each_ref_fn fn, void *cb_data)
+int for_each_replace_ref(struct repository *r, each_ref_fn fn, void *cb_data)
 {
-	return do_for_each_ref(get_main_ref_store(the_repository),
+	return do_for_each_ref(get_main_ref_store(r),
 			       git_replace_ref_base, fn,
 			       strlen(git_replace_ref_base),
 			       DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
diff --git a/refs.h b/refs.h
@@ -300,9 +300,7 @@ int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
 int for_each_tag_ref(each_ref_fn fn, void *cb_data);
 int for_each_branch_ref(each_ref_fn fn, void *cb_data);
 int for_each_remote_ref(each_ref_fn fn, void *cb_data);
-#define for_each_replace_ref(r, fn, cb) \
-	for_each_replace_ref_##r(fn, cb)
-int for_each_replace_ref_the_repository(each_ref_fn fn, void *cb_data);
+int for_each_replace_ref(struct repository *r, each_ref_fn fn, void *cb_data);
 int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
 int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
 			 const char *prefix, void *cb_data);

Original file line number	Diff line number	Diff line change
`@@ -1415,9 +1415,9 @@ int refs_for_each_fullref_in(struct ref_store refs, const char prefix,`
`1415`	`1415`	`return do_for_each_ref(refs, prefix, fn, 0, flag, cb_data);`
`1416`	`1416`	`}`
`1417`	`1417`
`1418`		`-int for_each_replace_ref_the_repository(each_ref_fn fn, void *cb_data)`
	`1418`	`+int for_each_replace_ref(struct repository r, each_ref_fn fn, void cb_data)`
`1419`	`1419`	`{`
`1420`		`- return do_for_each_ref(get_main_ref_store(the_repository),`
	`1420`	`+ return do_for_each_ref(get_main_ref_store(r),`
`1421`	`1421`	`git_replace_ref_base, fn,`
`1422`	`1422`	`strlen(git_replace_ref_base),`
`1423`	`1423`	`DO_FOR_EACH_INCLUDE_BROKEN, cb_data);`