diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:19:34 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:19:34 (GMT) |
commit | c0e78f7e4687e7bd5ff0b83974b28c1cc81c5487 (patch) | |
tree | 7e76e391d8b932b10461fb6f9f64522ce5ba747c /builtin/verify-commit.c | |
parent | 8202d12fca5d482640a51c663d4d556c46dbc6b8 (diff) | |
parent | 837303700a73836930cfe1e870e5abb8c730e2fd (diff) | |
download | git-c0e78f7e4687e7bd5ff0b83974b28c1cc81c5487.zip git-c0e78f7e4687e7bd5ff0b83974b28c1cc81c5487.tar.gz git-c0e78f7e4687e7bd5ff0b83974b28c1cc81c5487.tar.bz2 |
Merge branch 'jk/unused-params-final-batch'
* jk/unused-params-final-batch:
verify-commit: simplify parameters to run_gpg_verify()
show-branch: drop unused parameter from show_independent()
rev-list: drop unused void pointer from finish_commit()
remove_all_fetch_refspecs(): drop unused "remote" parameter
receive-pack: drop unused "commands" from prepare_shallow_update()
pack-objects: drop unused rev_info parameters
name-rev: drop unused parameters from is_better_name()
mktree: drop unused length parameter
wt-status: drop unused status parameter
read-cache: drop unused parameter from threaded load
clone: drop dest parameter from copy_alternates()
submodule: drop unused prefix parameter from some functions
builtin: consistently pass cmd_* prefix to parse_options
cmd_{read,write}_tree: rename "unused" variable that is used
Diffstat (limited to 'builtin/verify-commit.c')
-rw-r--r-- | builtin/verify-commit.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c index 7772c07..4b9e823 100644 --- a/builtin/verify-commit.c +++ b/builtin/verify-commit.c @@ -21,15 +21,14 @@ static const char * const verify_commit_usage[] = { NULL }; -static int run_gpg_verify(const struct object_id *oid, const char *buf, unsigned long size, unsigned flags) +static int run_gpg_verify(struct commit *commit, unsigned flags) { struct signature_check signature_check; int ret; memset(&signature_check, 0, sizeof(signature_check)); - ret = check_commit_signature(lookup_commit(the_repository, oid), - &signature_check); + ret = check_commit_signature(commit, &signature_check); print_signature_buffer(&signature_check, flags); signature_check_clear(&signature_check); @@ -38,26 +37,20 @@ static int run_gpg_verify(const struct object_id *oid, const char *buf, unsigned static int verify_commit(const char *name, unsigned flags) { - enum object_type type; struct object_id oid; - char *buf; - unsigned long size; - int ret; + struct object *obj; if (get_oid(name, &oid)) return error("commit '%s' not found.", name); - buf = read_object_file(&oid, &type, &size); - if (!buf) + obj = parse_object(the_repository, &oid); + if (!obj) return error("%s: unable to read file.", name); - if (type != OBJ_COMMIT) + if (obj->type != OBJ_COMMIT) return error("%s: cannot verify a non-commit object of type %s.", - name, type_name(type)); - - ret = run_gpg_verify(&oid, buf, size, flags); + name, type_name(obj->type)); - free(buf); - return ret; + return run_gpg_verify((struct commit *)obj, flags); } static int git_verify_commit_config(const char *var, const char *value, void *cb) |