refs: replace `refs_for_each_rawref_in()`

Replace calls to `refs_for_each_rawref_in()` with the newly introduced
`refs_for_each_ref_ext()` function.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/remote.c b/builtin/remote.c
index ace390c671d61c1dc8088cdb56aa8fa73950bf06..0fddaa177331f649be5564536244124ceadce66c 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -912,6 +912,9 @@ static int mv(int argc, const char **argv, const char *prefix,
                                                old_remote_context.buf);
 
        if (refspecs_need_update) {
+               struct refs_for_each_ref_options opts = {
+                       .flags = REFS_FOR_EACH_INCLUDE_BROKEN,
+               };
                rename.transaction = ref_store_transaction_begin(get_main_ref_store(the_repository),
                                                               0, &err);
                if (!rename.transaction)
@@ -923,9 +926,10 @@ static int mv(int argc, const char **argv, const char *prefix,
 
                strbuf_reset(&buf);
                strbuf_addf(&buf, "refs/remotes/%s/", rename.old_name);
+               opts.prefix = buf.buf;
 
-               result = refs_for_each_rawref_in(get_main_ref_store(the_repository), buf.buf,
-                               rename_one_ref, &rename);
+               result = refs_for_each_ref_ext(get_main_ref_store(the_repository),
+                                              rename_one_ref, &rename, &opts);
                if (result < 0)
                        die(_("queueing remote ref renames failed: %s"), rename.err->buf);
 

diff --git a/refs.c b/refs.c
index 791654a0f6c4c5a5f90246dcf71949ec335b6dd3..172d4cf941f464077045866d692d6b6ad54774cf 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1982,16 +1982,6 @@ int refs_for_each_namespaced_ref(struct ref_store *refs,
        return refs_for_each_ref_ext(refs, cb, cb_data, &opts);
 }
 
-int refs_for_each_rawref_in(struct ref_store *refs, const char *prefix,
-                           refs_for_each_cb cb, void *cb_data)
-{
-       struct refs_for_each_ref_options opts = {
-               .prefix = prefix,
-               .flags = REFS_FOR_EACH_INCLUDE_BROKEN,
-       };
-       return refs_for_each_ref_ext(refs, cb, cb_data, &opts);
-}
-
 static int qsort_strcmp(const void *va, const void *vb)
 {
        const char *a = *(const char **)va;

diff --git a/refs.h b/refs.h
index 01dc3c2fd40ec9daf30c162afd5dcc10b9cc32b0..673d4ccce50d61999667d63a91346f6040af5fda 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -542,10 +542,6 @@ int refs_for_each_namespaced_ref(struct ref_store *refs,
                                 const char **exclude_patterns,
                                 refs_for_each_cb fn, void *cb_data);
 
-/* can be used to learn about broken ref and symref */
-int refs_for_each_rawref_in(struct ref_store *refs, const char *prefix,
-                           refs_for_each_cb fn, void *cb_data);
-
 /*
  * Normalizes partial refs to their fully qualified form.
  * Will prepend <prefix> to the <pattern> if it doesn't start with 'refs/'.