fetch-object: unify fetch_object[s] functions

There are fetch_object() and fetch_objects() helpers in
fetch-object.h; as the latter takes "struct oid_array",
the former cannot be made into a thin wrapper around the
latter without an extra allocation and set-up cost.

Update fetch_objects() to take an array of "struct object_id"
and number of elements in it as separate parameters, remove
fetch_object(), and adjust all existing callers of these
functions to use the new fetch_objects().

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/fetch-object.c b/fetch-object.c
index 853624f811c59c17af88814ebeecf4154095a19c..1af1bf857a1710289603b8c8139e2ae2d830732d 100644 (file)
--- a/fetch-object.c
+++ b/fetch-object.c
@@ -23,21 +23,15 @@ static void fetch_refs(const char *remote_name, struct ref *ref)
        fetch_if_missing = original_fetch_if_missing;
 }
 
        fetch_if_missing = original_fetch_if_missing;
 }
 

-void fetch_object(const char *remote_name, const unsigned char *sha1)
-{
-       struct ref *ref = alloc_ref(sha1_to_hex(sha1));
-       hashcpy(ref->old_oid.hash, sha1);
-       fetch_refs(remote_name, ref);
-}
-
-void fetch_objects(const char *remote_name, const struct oid_array *to_fetch)
+void fetch_objects(const char *remote_name, const struct object_id *oids,
+                  int oid_nr)

 {
        struct ref *ref = NULL;
        int i;
 
 {
        struct ref *ref = NULL;
        int i;
 

-       for (i = 0; i < to_fetch->nr; i++) {
-               struct ref *new_ref = alloc_ref(oid_to_hex(&to_fetch->oid[i]));
-               oidcpy(&new_ref->old_oid, &to_fetch->oid[i]);
+       for (i = 0; i < oid_nr; i++) {
+               struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i]));
+               oidcpy(&new_ref->old_oid, &oids[i]);

                new_ref->next = ref;
                ref = new_ref;
        }
                new_ref->next = ref;
                ref = new_ref;
        }

diff --git a/fetch-object.h b/fetch-object.h
index 4b269d07ed635b3e6b1f5f7b2118d290d27e7e4e..d2f996d4e8c79c7bde78780dad5ad543910fcc29 100644 (file)
--- a/fetch-object.h
+++ b/fetch-object.h
@@ -1,11 +1,7 @@
 #ifndef FETCH_OBJECT_H
 #define FETCH_OBJECT_H
 
 #ifndef FETCH_OBJECT_H
 #define FETCH_OBJECT_H
 

-#include "sha1-array.h"
-
-extern void fetch_object(const char *remote_name, const unsigned char *sha1);
-
-extern void fetch_objects(const char *remote_name,
-                         const struct oid_array *to_fetch);
+void fetch_objects(const char *remote_name, const struct object_id *oids,
+                  int oid_nr);

 
 #endif
 
 #endif

diff --git a/sha1-file.c b/sha1-file.c
index 97b74238483e00c3f07bd5ab0879eb84bf5c8dfa..2edf4564f6c12f33c59a101470cd2964774fcc34 100644 (file)
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -1317,7 +1317,7 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
                         * TODO Pass a repository struct through fetch_object,
                         * such that arbitrary repositories work.
                         */
                         * TODO Pass a repository struct through fetch_object,
                         * such that arbitrary repositories work.
                         */

-                       fetch_object(repository_format_partial_clone, real->hash);
+                       fetch_objects(repository_format_partial_clone, real, 1);

                        already_retried = 1;
                        continue;
                }
                        already_retried = 1;
                        continue;
                }

diff --git a/unpack-trees.c b/unpack-trees.c
index f25089b878a8b0842a9d6407cb6b1821867a737c..82a83dbc67ba8410e8745c0a508bf9d0dd7b6027 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -392,7 +392,7 @@ static int check_updates(struct unpack_trees_options *o)
                }
                if (to_fetch.nr)
                        fetch_objects(repository_format_partial_clone,
                }
                if (to_fetch.nr)
                        fetch_objects(repository_format_partial_clone,

-                                     &to_fetch);
+                                     to_fetch.oid, to_fetch.nr);

                fetch_if_missing = fetch_if_missing_store;
                oid_array_clear(&to_fetch);
        }
                fetch_if_missing = fetch_if_missing_store;
                oid_array_clear(&to_fetch);
        }