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

sha1_file: convert check_sha1_signature to struct object_id

Browse Source 
Convert this function to take a pointer to struct object_id and rename
it check_object_signature.  Introduce temporaries to convert the return
values of lookup_replace_object and lookup_replace_object_extended into
struct object_id.

The temporaries are needed because in order to convert
lookup_replace_object, open_istream needs to be converted, and
open_istream needs check_sha1_signature to be converted, causing a loop
of dependencies.  The temporaries will be removed in a future patch.

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:39 +00:00
committed by Junio C Hamano
parent d61d87bd15
commit 17e65451e3
7 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/mktag.c
View File

@ -27,8 +27,11 @@ static int verify_object(const struct object_id *oid, const char *expected_type)
const unsigned char *repl = lookup_replace_object(oid->hash);
if (buffer) {
struct object_id reploid;
hashcpy(reploid.hash, repl);
if (type == type_from_string(expected_type))
ret = check_sha1_signature(repl, buffer, size, expected_type);
ret = check_object_signature(&reploid, buffer, size, expected_type);
free(buffer);
}
return ret;