shallow: rewrite functions to take object_id arguments

diff --git a/submodule.c b/submodule.c
index d491e6a7717ef0e1b9f7efd91becb024b98e0161..f0f34b6f4d1bf436edbfb4ab7c22c626e15e8266 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -429,10 +429,13 @@ static int has_remote(const char *refname, const unsigned char *sha1, int flags,
 
 static int submodule_needs_pushing(const char *path, const unsigned char sha1[20])
 {
+       struct each_ref_fn_sha1_adapter wrapped_has_remote =
+               {has_remote, NULL};
+
        if (add_submodule_odb(path) || !lookup_commit_reference(sha1))
                return 0;
 
-       if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
+       if (for_each_remote_ref_submodule(path, each_ref_fn_adapter, &wrapped_has_remote) > 0) {
                struct child_process cp = CHILD_PROCESS_INIT;
                const char *argv[] = {"rev-list", NULL, "--not", "--remotes", "-n", "1" , NULL};
                struct strbuf buf = STRBUF_INIT;
@@ -519,10 +522,13 @@ int find_unpushed_submodules(unsigned char new_sha1[20],
 
 static int push_submodule(const char *path)
 {
+       struct each_ref_fn_sha1_adapter wrapped_has_remote =
+               {has_remote, NULL};
+
        if (add_submodule_odb(path))
                return 1;
 
-       if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
+       if (for_each_remote_ref_submodule(path, each_ref_fn_adapter, &wrapped_has_remote) > 0) {
                struct child_process cp = CHILD_PROCESS_INIT;
                const char *argv[] = {"push", NULL};
 
@@ -626,7 +632,10 @@ static int add_sha1_to_array(const char *ref, const unsigned char *sha1,
 void check_for_new_submodule_commits(unsigned char new_sha1[20])
 {
        if (!initialized_fetch_ref_tips) {
-               for_each_ref(add_sha1_to_array, &ref_tips_before_fetch);
+               struct each_ref_fn_sha1_adapter wrapped_add_sha1_to_array =
+                       {add_sha1_to_array, &ref_tips_before_fetch};
+
+               for_each_ref(each_ref_fn_adapter, &wrapped_add_sha1_to_array);
                initialized_fetch_ref_tips = 1;
        }