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

14
object.c
View File

@ -244,7 +244,7 @@ struct object *parse_object(const struct object_id *oid)
unsigned long size;
enum object_type type;
int eaten;
const unsigned char *repl = lookup_replace_object(oid->hash);
const struct object_id *repl = lookup_replace_object(oid);
void *buffer;
struct object *obj;
@ -255,10 +255,7 @@ struct object *parse_object(const struct object_id *oid)
if ((obj && obj->type == OBJ_BLOB && has_object_file(oid)) ||
(!obj && has_object_file(oid) &&
oid_object_info(oid, NULL) == OBJ_BLOB)) {
struct object_id reploid;
hashcpy(reploid.hash, repl);
if (check_object_signature(&reploid, NULL, 0, NULL) < 0) {
if (check_object_signature(repl, NULL, 0, NULL) < 0) {
error("sha1 mismatch %s", oid_to_hex(oid));
return NULL;
}
@ -268,12 +265,9 @@ struct object *parse_object(const struct object_id *oid)
buffer = read_object_file(oid, &type, &size);
if (buffer) {
struct object_id reploid;
hashcpy(reploid.hash, repl);
if (check_object_signature(&reploid, buffer, size, type_name(type)) < 0) {
if (check_object_signature(repl, buffer, size, type_name(type)) < 0) {
free(buffer);
error("sha1 mismatch %s", sha1_to_hex(repl));
error("sha1 mismatch %s", oid_to_hex(repl));
return NULL;
}