From: Jeff King Date: Thu, 07 Dec 2023 07:26:31 GMT Subject: [PATCH 8/9] gpg-interface: drop pointless config_error_nonbool() checks Message-ID: <20231207072631.GH1277973@coredump.intra.peff.net> In-Reply-To: <20231207072338.GA1277727@coredump.intra.peff.net> 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 --- gpg-interface.c | 15 +++------------ 1 file 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"; -- 2.43.0.664.ga12c899002