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

Convert remaining callers of sha1_object_info_extended to object_id

Browse Source 
Convert the remaining caller of sha1_object_info_extended to use struct
object_id.  Introduce temporaries, which will be removed later, since
there is a dependency loop between sha1_object_info_extended and
lookup_replace_object_extended.  This allows us to convert the code in a
piecemeal fashion instead of all at once.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2018-03-12 02:27:45 +00:00 committed by Junio C Hamano
parent 4310b0c441
commit 7984f23833
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sha1_file.c
View File

@ -1231,6 +1231,9 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
lookup_replace_object(sha1) : lookup_replace_object(sha1) :
sha1; sha1;
int already_retried = 0; int already_retried = 0;
struct object_id realoid;
hashcpy(realoid.hash, real);
if (is_null_sha1(real)) if (is_null_sha1(real))
return -1; return -1;
@ -1295,7 +1298,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
rtype = packed_object_info(e.p, e.offset, oi); rtype = packed_object_info(e.p, e.offset, oi);
if (rtype < 0) { if (rtype < 0) {
mark_bad_packed_object(e.p, real); mark_bad_packed_object(e.p, real);
return sha1_object_info_extended(real, oi, 0); return sha1_object_info_extended(realoid.hash, oi, 0);
} else if (oi->whence == OI_PACKED) { } else if (oi->whence == OI_PACKED) {
oi->u.packed.offset = e.offset; oi->u.packed.offset = e.offset;
oi->u.packed.pack = e.p; oi->u.packed.pack = e.p;
@ -1323,13 +1326,16 @@ int sha1_object_info(const unsigned char *sha1, unsigned long *sizep)
static void *read_object(const unsigned char *sha1, enum object_type *type, static void *read_object(const unsigned char *sha1, enum object_type *type,
unsigned long *size) unsigned long *size)
{ {
struct object_id oid;
struct object_info oi = OBJECT_INFO_INIT; struct object_info oi = OBJECT_INFO_INIT;
void *content; void *content;
oi.typep = type; oi.typep = type;
oi.sizep = size; oi.sizep = size;
oi.contentp = &content; oi.contentp = &content;
if (sha1_object_info_extended(sha1, &oi, 0) < 0) hashcpy(oid.hash, sha1);
if (sha1_object_info_extended(oid.hash, &oi, 0) < 0)
return NULL; return NULL;
return content; return content;
} }
@ -1723,9 +1729,11 @@ int force_object_loose(const struct object_id *oid, time_t mtime)
int has_sha1_file_with_flags(const unsigned char *sha1, int flags) int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
{ {
struct object_id oid;
if (!startup_info->have_repository) if (!startup_info->have_repository)
return 0; return 0;
return sha1_object_info_extended(sha1, NULL, hashcpy(oid.hash, sha1);
return sha1_object_info_extended(oid.hash, NULL,
flags | OBJECT_INFO_SKIP_CACHED) >= 0; flags | OBJECT_INFO_SKIP_CACHED) >= 0;
} }

5
streaming.c
View File

@ -111,10 +111,13 @@ static enum input_source istream_source(const unsigned char *sha1,
{ {
unsigned long size; unsigned long size;
int status; int status;
struct object_id oid;
hashcpy(oid.hash, sha1);
oi->typep = type; oi->typep = type;
oi->sizep = &size; oi->sizep = &size;
status = sha1_object_info_extended(sha1, oi, 0); status = sha1_object_info_extended(oid.hash, oi, 0);
if (status < 0) if (status < 0)
return stream_error; return stream_error;