refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/replace.c b/builtin/replace.c
index e997a562f0fc9201f22b3a162621d3888dc1b70c..b5861a0ee91f82f6e7bc7641bec140e0ee3ed06c 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -39,7 +39,8 @@ struct show_data {
        enum replace_format format;
 };
 
        enum replace_format format;
 };
 

-static int show_reference(const char *refname, const struct object_id *oid,
+static int show_reference(struct repository *r, const char *refname,
+                         const struct object_id *oid,

                          int flag, void *cb_data)
 {
        struct show_data *data = cb_data;
                          int flag, void *cb_data)
 {
        struct show_data *data = cb_data;


@@ -56,9 +57,8 @@ static int show_reference(const char *refname, const struct object_id *oid,
                        if (get_oid(refname, &object))
                                return error("Failed to resolve '%s' as a valid ref.", refname);
 
                        if (get_oid(refname, &object))
                                return error("Failed to resolve '%s' as a valid ref.", refname);
 

-                       obj_type = oid_object_info(the_repository, &object,
-                                                  NULL);
-                       repl_type = oid_object_info(the_repository, oid, NULL);
+                       obj_type = oid_object_info(r, &object, NULL);
+                       repl_type = oid_object_info(r, oid, NULL);

 
                        printf("%s (%s) -> %s (%s)\n", refname, type_name(obj_type),
                               oid_to_hex(oid), type_name(repl_type));
 
                        printf("%s (%s) -> %s (%s)\n", refname, type_name(obj_type),
                               oid_to_hex(oid), type_name(repl_type));

diff --git a/refs.c b/refs.c
index 7cd76f72d295e5bd54637a45dc22662d75f04002..c5a5f727e8aa354d881e5528f471f395f4a6ed12 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1474,12 +1474,11 @@ 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);
 }
 
        return do_for_each_ref(refs, prefix, fn, 0, flag, cb_data);
 }
 

-int for_each_replace_ref(struct repository *r, each_ref_fn fn, void *cb_data)
+int for_each_replace_ref(struct repository *r, each_repo_ref_fn fn, void *cb_data)

 {
 {

-       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);
+       return do_for_each_repo_ref(r, git_replace_ref_base, fn,
+                                   strlen(git_replace_ref_base),
+                                   DO_FOR_EACH_INCLUDE_BROKEN, cb_data);

 }
 
 int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
 }
 
 int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)

diff --git a/refs.h b/refs.h
index 80eec8bbc68e378d6b8424100fce798ba233f8ca..a0a18223a146f0f676bb4165955333309c372a92 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -317,7 +317,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);
 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);

-int for_each_replace_ref(struct repository *r, each_ref_fn fn, void *cb_data);
+int for_each_replace_ref(struct repository *r, each_repo_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);
 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);

diff --git a/replace-object.c b/replace-object.c
index 4162df6324a8ec76a2704245db4a2d707179d9d7..3c17864eb7d842f7abdbd6a6d87106468376f659 100644 (file)
--- a/replace-object.c
+++ b/replace-object.c
@@ -6,7 +6,8 @@
 #include "repository.h"
 #include "commit.h"
 
 #include "repository.h"
 #include "commit.h"
 

-static int register_replace_ref(const char *refname,
+static int register_replace_ref(struct repository *r,
+                               const char *refname,

                                const struct object_id *oid,
                                int flag, void *cb_data)
 {
                                const struct object_id *oid,
                                int flag, void *cb_data)
 {


@@ -25,7 +26,7 @@ static int register_replace_ref(const char *refname,
        oidcpy(&repl_obj->replacement, oid);
 
        /* Register new object */
        oidcpy(&repl_obj->replacement, oid);
 
        /* Register new object */

-       if (oidmap_put(the_repository->objects->replace_map, repl_obj))
+       if (oidmap_put(r->objects->replace_map, repl_obj))

                die("duplicate replace ref: %s", refname);
 
        return 0;
                die("duplicate replace ref: %s", refname);
 
        return 0;