kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint 

has_object_file() said "no" given an object registered to the
system via pretend_object_file(), making it inconsistent with
read_object_file(), causing lazy fetch to attempt fetching an
empty tree from promisor remotes.

* jt/sha1-file-remove-oi-skip-cached:
  sha1-file: remove OBJECT_INFO_SKIP_CACHED
maint
Junio C Hamano 2020-02-14 12:42:27 -08:00
parent 3bba763373 9c8a294a1a
commit 9eddeaece1
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
object-store.h
View File

@ -292,8 +292,6 @@ struct object_info {
#define OBJECT_INFO_LOOKUP_REPLACE 1 #define OBJECT_INFO_LOOKUP_REPLACE 1
/* Allow reading from a loose object file of unknown/bogus type */ /* Allow reading from a loose object file of unknown/bogus type */
#define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2 #define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2
/* Do not check cached storage */
#define OBJECT_INFO_SKIP_CACHED 4
/* Do not retry packed storage after checking packed and loose storage */ /* Do not retry packed storage after checking packed and loose storage */
#define OBJECT_INFO_QUICK 8 #define OBJECT_INFO_QUICK 8
/* Do not check loose object */ /* Do not check loose object */

38
sha1-file.c
View File

@ -1417,6 +1417,7 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
struct object_info *oi, unsigned flags) struct object_info *oi, unsigned flags)
{ {
static struct object_info blank_oi = OBJECT_INFO_INIT; static struct object_info blank_oi = OBJECT_INFO_INIT;
struct cached_object *co;
struct pack_entry e; struct pack_entry e;
int rtype; int rtype;
const struct object_id *real = oid; const struct object_id *real = oid;
@ -1431,24 +1432,22 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
if (!oi) if (!oi)
oi = &blank_oi; oi = &blank_oi;


if (!(flags & OBJECT_INFO_SKIP_CACHED)) { co = find_cached_object(real);
struct cached_object *co = find_cached_object(real); if (co) {
if (co) { if (oi->typep)
if (oi->typep) *(oi->typep) = co->type;
*(oi->typep) = co->type; if (oi->sizep)
if (oi->sizep) *(oi->sizep) = co->size;
*(oi->sizep) = co->size; if (oi->disk_sizep)
if (oi->disk_sizep) *(oi->disk_sizep) = 0;
*(oi->disk_sizep) = 0; if (oi->delta_base_sha1)
if (oi->delta_base_sha1) hashclr(oi->delta_base_sha1);
hashclr(oi->delta_base_sha1); if (oi->type_name)
if (oi->type_name) strbuf_addstr(oi->type_name, type_name(co->type));
strbuf_addstr(oi->type_name, type_name(co->type)); if (oi->contentp)
if (oi->contentp) *oi->contentp = xmemdupz(co->buf, co->size);
*oi->contentp = xmemdupz(co->buf, co->size); oi->whence = OI_CACHED;
oi->whence = OI_CACHED; return 0;
return 0;
}
} }


while (1) { while (1) {
@ -1932,8 +1931,7 @@ int repo_has_object_file_with_flags(struct repository *r,
{ {
if (!startup_info->have_repository) if (!startup_info->have_repository)
return 0; return 0;
return oid_object_info_extended(r, oid, NULL, return oid_object_info_extended(r, oid, NULL, flags) >= 0;
flags | OBJECT_INFO_SKIP_CACHED) >= 0;
} }


int repo_has_object_file(struct repository *r, int repo_has_object_file(struct repository *r,