diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 16:23:49 (GMT) |
| commit | 17e65451e305b7501fddec35125bf5d39a4cdcac (patch) | |
| tree | ffd070759d814151fd56faebfa4a9b951eeaa240 /builtin/mktag.c | |
| parent | d61d87bd156a1d49b827d1b26f023fd70febfa06 (diff) | |
| download | git-17e65451e305b7501fddec35125bf5d39a4cdcac.zip git-17e65451e305b7501fddec35125bf5d39a4cdcac.tar.gz git-17e65451e305b7501fddec35125bf5d39a4cdcac.tar.bz2 | |
sha1_file: convert check_sha1_signature to struct object_id
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>
Diffstat (limited to 'builtin/mktag.c')
| -rw-r--r-- | builtin/mktag.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/mktag.c b/builtin/mktag.c index 65bb41e..810b24b 100644 --- a/builtin/mktag.c +++ b/builtin/mktag.c @@ -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; |