eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-12 05:43:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

packfile: packed_object_info avoids packed_to_object_type

Browse Source 
For entries in the delta base cache, packed_to_object_type calls
can be omitted.  This prepares us to bypass content_limit for
non-blob types in the following commit.

Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Wong 2024-08-23 22:46:26 +00:00 committed by Junio C Hamano
parent 98521d6f04
commit 28402bcedd
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packfile.c
View File

@ -1527,7 +1527,7 @@ int packed_object_info(struct repository *r, struct packed_git *p,
{
struct pack_window *w_curs = NULL;
off_t curpos = obj_offset;
enum object_type type;
enum object_type type, final_type = OBJ_BAD;
struct delta_base_cache_entry *ent;
/*
@ -1538,7 +1538,7 @@ int packed_object_info(struct repository *r, struct packed_git *p,
ent = get_delta_base_cache_entry(p, obj_offset);
if (ent) {
oi->whence = OI_DBCACHED;
type = ent->type;
final_type = type = ent->type;
if (oi->sizep)
*oi->sizep = ent->size;
if (oi->contentp) {
@ -1556,6 +1556,7 @@ int packed_object_info(struct repository *r, struct packed_git *p,
} else if (oi->contentp && !oi->content_limit) {
*oi->contentp = unpack_entry(r, p, obj_offset, &type,
oi->sizep);
final_type = type;
if (!*oi->contentp)
type = OBJ_BAD;
} else {
@ -1585,6 +1586,7 @@ int packed_object_info(struct repository *r, struct packed_git *p,
if (oi->sizep && *oi->sizep <= oi->content_limit) {
*oi->contentp = unpack_entry(r, p, obj_offset,
&type, oi->sizep);
final_type = type;
if (!*oi->contentp)
type = OBJ_BAD;
} else {
@ -1606,17 +1608,17 @@ int packed_object_info(struct repository *r, struct packed_git *p,
}
if (oi->typep || oi->type_name) {
enum object_type ptot;
ptot = packed_to_object_type(r, p, obj_offset,
type, &w_curs, curpos);
if (final_type < 0)
final_type = packed_to_object_type(r, p, obj_offset,
type, &w_curs, curpos);
if (oi->typep)
*oi->typep = ptot;
*oi->typep = final_type;
if (oi->type_name) {
const char *tn = type_name(ptot);
const char *tn = type_name(final_type);
if (tn)
strbuf_addstr(oi->type_name, tn);
}
if (ptot < 0) {
if (final_type < 0) {
type = OBJ_BAD;
goto out;
}