diff options
| author | Jeff King <peff@peff.net> | 2023-12-07 08:26:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-09 00:26:22 +0100 |
| commit | 004c9432f7e4c9f1f3b915b0785d0f175dc664fe (patch) | |
| tree | 51d909c2f2c76b64e96f8d1dffa57000a54c3f3b /gpg-interface.c | |
| parent | push: drop confusing configset/callback redundancy (diff) | |
| download | git-004c9432f7e4c9f1f3b915b0785d0f175dc664fe.tar.xz git-004c9432f7e4c9f1f3b915b0785d0f175dc664fe.zip | |
gpg-interface: drop pointless config_error_nonbool() checks
Config callbacks which use git_config_string() or git_config_pathname()
have no need to check for a NULL value. This is handled automatically
by those helpers.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gpg-interface.c')
| -rw-r--r-- | gpg-interface.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gpg-interface.c b/gpg-interface.c index 48f43c5a21..25c42cb9fd 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -762,23 +762,14 @@ static int git_gpg_config(const char *var, const char *value, return 0; } - if (!strcmp(var, "gpg.ssh.defaultkeycommand")) { - if (!value) - return config_error_nonbool(var); + if (!strcmp(var, "gpg.ssh.defaultkeycommand")) return git_config_string(&ssh_default_key_command, var, value); - } - if (!strcmp(var, "gpg.ssh.allowedsignersfile")) { - if (!value) - return config_error_nonbool(var); + if (!strcmp(var, "gpg.ssh.allowedsignersfile")) return git_config_pathname(&ssh_allowed_signers, var, value); - } - if (!strcmp(var, "gpg.ssh.revocationfile")) { - if (!value) - return config_error_nonbool(var); + if (!strcmp(var, "gpg.ssh.revocationfile")) return git_config_pathname(&ssh_revocation_file, var, value); - } if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program")) fmtname = "openpgp"; |