mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fetch-pack: add a deref_without_lazy_fetch_extended()"

Browse Source 
This reverts commit a6e65fb39c.

This revert simplifies the next patch in this patch set.

The commit message of that commit mentions that the new function "will
be used for the bundle-uri client in a subsequent commit", but it seems
that eventually it wasn't used.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Tan
2024-11-05 11:24:18 -08:00
committed by Junio C Hamano
parent 23d289d273
commit bf1feb9e53
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fetch-pack.c
View File

@ -122,12 +122,11 @@ static void for_each_cached_alternate(struct fetch_negotiator *negotiator,
cb(negotiator, cache.items[i]); cb(negotiator, cache.items[i]);
} }
static struct commit *deref_without_lazy_fetch_extended(const struct object_id *oid, static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
int mark_tags_complete, int mark_tags_complete)
enum object_type *type,
unsigned int oi_flags)
{ {
struct object_info info = { .typep = type }; enum object_type type;
struct object_info info = { .typep = &type };
struct commit *commit; struct commit *commit;
commit = lookup_commit_in_graph(the_repository, oid); commit = lookup_commit_in_graph(the_repository, oid);
@ -136,9 +135,9 @@ static struct commit *deref_without_lazy_fetch_extended(const struct object_id *
while (1) { while (1) {
if (oid_object_info_extended(the_repository, oid, &info, if (oid_object_info_extended(the_repository, oid, &info,
oi_flags)) OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK))
return NULL; return NULL;
if (*type == OBJ_TAG) { if (type == OBJ_TAG) {
struct tag *tag = (struct tag *) struct tag *tag = (struct tag *)
parse_object(the_repository, oid); parse_object(the_repository, oid);
@ -152,7 +151,7 @@ static struct commit *deref_without_lazy_fetch_extended(const struct object_id *
} }
} }
if (*type == OBJ_COMMIT) { if (type == OBJ_COMMIT) {
struct commit *commit = lookup_commit(the_repository, oid); struct commit *commit = lookup_commit(the_repository, oid);
if (!commit || repo_parse_commit(the_repository, commit)) if (!commit || repo_parse_commit(the_repository, commit))
return NULL; return NULL;
@ -162,16 +161,6 @@ static struct commit *deref_without_lazy_fetch_extended(const struct object_id *
return NULL; return NULL;
} }
static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
int mark_tags_complete)
{
enum object_type type;
unsigned flags = OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK;
return deref_without_lazy_fetch_extended(oid, mark_tags_complete,
&type, flags);
}
static int rev_list_insert_ref(struct fetch_negotiator *negotiator, static int rev_list_insert_ref(struct fetch_negotiator *negotiator,
const struct object_id *oid) const struct object_id *oid)
{ {