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

Convert lookup_replace_object to struct object_id

Browse Source 
Convert both the argument and the return value to be pointers to struct
object_id.  Update the callers and their internals to deal with the new
type.  Remove several temporaries which are no longer needed.

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:54 +00:00
committed by Junio C Hamano
parent b4f5aca40e
commit b383a13cc0
6 changed files with 42 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
sha1_file.c
View File

@ -1227,22 +1227,20 @@ int oid_object_info_extended(const struct object_id *oid, struct object_info *oi
static struct object_info blank_oi = OBJECT_INFO_INIT;
struct pack_entry e;
int rtype;
const unsigned char *real = (flags & OBJECT_INFO_LOOKUP_REPLACE) ?
lookup_replace_object(oid->hash) :
oid->hash;
const struct object_id *real = oid;
int already_retried = 0;
struct object_id realoid;
hashcpy(realoid.hash, real);
if (flags & OBJECT_INFO_LOOKUP_REPLACE)
real = lookup_replace_object(oid);
if (is_null_sha1(real))
if (is_null_oid(real))
return -1;
if (!oi)
oi = &blank_oi;
if (!(flags & OBJECT_INFO_SKIP_CACHED)) {
struct cached_object *co = find_cached_object(real);
struct cached_object *co = find_cached_object(real->hash);
if (co) {
if (oi->typep)
*(oi->typep) = co->type;
@ -1262,16 +1260,16 @@ int oid_object_info_extended(const struct object_id *oid, struct object_info *oi
}
while (1) {
if (find_pack_entry(real, &e))
if (find_pack_entry(real->hash, &e))
break;
/* Most likely it's a loose object. */
if (!sha1_loose_object_info(real, oi, flags))
if (!sha1_loose_object_info(real->hash, oi, flags))
return 0;
/* Not a loose object; someone else may have just packed it. */
reprepare_packed_git();
if (find_pack_entry(real, &e))
if (find_pack_entry(real->hash, &e))
break;
/* Check if it is a missing object */
@ -1281,7 +1279,7 @@ int oid_object_info_extended(const struct object_id *oid, struct object_info *oi
* TODO Investigate haveing fetch_object() return
* TODO error/success and stopping the music here.
*/
fetch_object(repository_format_partial_clone, real);
fetch_object(repository_format_partial_clone, real->hash);
already_retried = 1;
continue;
}
@ -1297,8 +1295,8 @@ int oid_object_info_extended(const struct object_id *oid, struct object_info *oi
return 0;
rtype = packed_object_info(e.p, e.offset, oi);
if (rtype < 0) {
mark_bad_packed_object(e.p, real);
return oid_object_info_extended(&realoid, oi, 0);
mark_bad_packed_object(e.p, real->hash);
return oid_object_info_extended(real, oi, 0);
} else if (oi->whence == OI_PACKED) {
oi->u.packed.offset = e.offset;
oi->u.packed.pack = e.p;
@ -1372,11 +1370,11 @@ void *read_object_file_extended(const struct object_id *oid,
const struct packed_git *p;
const char *path;
struct stat st;
const unsigned char *repl = lookup_replace ? lookup_replace_object(oid->hash)
: oid->hash;
const struct object_id *repl = lookup_replace ? lookup_replace_object(oid)
: oid;
errno = 0;
data = read_object(repl, type, size);
data = read_object(repl->hash, type, size);
if (data)
return data;
@ -1384,17 +1382,17 @@ void *read_object_file_extended(const struct object_id *oid,
die_errno("failed to read object %s", oid_to_hex(oid));
/* die if we replaced an object with one that does not exist */
if (repl != oid->hash)
if (repl != oid)
die("replacement %s not found for %s",
sha1_to_hex(repl), oid_to_hex(oid));
oid_to_hex(repl), oid_to_hex(oid));
if (!stat_sha1_file(repl, &st, &path))
if (!stat_sha1_file(repl->hash, &st, &path))
die("loose object %s (stored in %s) is corrupt",
sha1_to_hex(repl), path);
oid_to_hex(repl), path);
if ((p = has_packed_and_bad(repl)) != NULL)
if ((p = has_packed_and_bad(repl->hash)) != NULL)
die("packed object %s (stored in %s) is corrupt",
sha1_to_hex(repl), p->pack_name);
oid_to_hex(repl), p->pack_name);
return NULL;
}