undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch-object: unify fetch_object[s] functions

Browse Source 
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>
This commit is contained in:
Jonathan Tan 2018-09-12 08:47:37 -07:00 committed by Junio C Hamano
parent 1d4361b0f3
commit 8708ca09a6
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fetch-object.c
View File

@ -23,21 +23,15 @@ static void fetch_refs(const char *remote_name, struct ref *ref)
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;
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;
}

8
fetch-object.h
View File

@ -1,11 +1,7 @@
#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

2
sha1-file.c
View File

@ -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.
*/
fetch_object(repository_format_partial_clone, real->hash);
fetch_objects(repository_format_partial_clone, real, 1);
already_retried = 1;
continue;
}

2
unpack-trees.c
View File

@ -392,7 +392,7 @@ static int check_updates(struct unpack_trees_options *o)
}
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);
}