mirror of
https://github.com/git/git.git
synced 2024-05-10 08:26:10 +02:00
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>
This commit is contained in:
parent
37e8a341ea
commit
004c9432f7
|
@ -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";
|
||||
|
|
Loading…
Reference in New Issue