undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/gpg-lazy-init'

Browse Source 
Instead of forcing each command to choose to honor GPG related
configuration variables, make the subsystem lazily initialize
itself.

* jc/gpg-lazy-init:
  drop pure pass-through config callbacks
  gpg-interface: lazily initialize and read the configuration
This commit is contained in:
Junio C Hamano 2023-03-17 14:03:10 -07:00
commit af5388d2dd
17 changed files with 37 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/am.c
View File

@ -2301,17 +2301,6 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar
return 0;
}
static int git_am_config(const char *k, const char *v, void *cb UNUSED)
{
int status;
status = git_gpg_config(k, v, NULL);
if (status)
return status;
return git_default_config(k, v, NULL);
}
int cmd_am(int argc, const char **argv, const char *prefix)
{
struct am_state state;
@ -2435,7 +2424,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(usage, options);
git_config(git_am_config, NULL);
git_config(git_default_config, NULL);
am_state_init(&state);

10
builtin/commit-tree.c
View File

@ -38,14 +38,6 @@ static void new_parent(struct commit *parent, struct commit_list **parents_p)
commit_list_insert(parent, parents_p);
}
static int commit_tree_config(const char *var, const char *value, void *cb)
{
int status = git_gpg_config(var, value, NULL);
if (status)
return status;
return git_default_config(var, value, cb);
}
static int parse_parent_arg_callback(const struct option *opt,
const char *arg, int unset)
{
@ -122,7 +114,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
OPT_END()
};
git_config(commit_tree_config, NULL);
git_config(git_default_config, NULL);
if (argc < 2 || !strcmp(argv[1], "-h"))
usage_with_options(commit_tree_usage, options);

4
builtin/commit.c
View File

@ -1600,7 +1600,6 @@ int cmd_status(int argc, const char **argv, const char *prefix)
static int git_commit_config(const char *k, const char *v, void *cb)
{
struct wt_status *s = cb;
int status;
if (!strcmp(k, "commit.template"))
return git_config_pathname(&template_file, k, v);
@ -1620,9 +1619,6 @@ static int git_commit_config(const char *k, const char *v, void *cb)
return 0;
}
status = git_gpg_config(k, v, NULL);
if (status)
return status;
return git_status_config(k, v, s);
}

2
builtin/log.c
View File

@ -603,8 +603,6 @@ static int git_log_config(const char *var, const char *value, void *cb)
return 0;
}
if (git_gpg_config(var, value, cb) < 0)
return -1;
return git_diff_ui_config(var, value, cb);
}

3
builtin/merge.c
View File

@ -661,9 +661,6 @@ static int git_merge_config(const char *k, const char *v, void *cb)
}
status = fmt_merge_msg_config(k, v, cb);
if (status)
return status;
status = git_gpg_config(k, v, NULL);
if (status)
return status;
return git_diff_ui_config(k, v, cb);

6
builtin/pull.c
View File

@ -360,8 +360,6 @@ static enum rebase_type config_get_rebase(int *rebase_unspecified)
*/
static int git_pull_config(const char *var, const char *value, void *cb)
{
int status;
if (!strcmp(var, "rebase.autostash")) {
config_autostash = git_config_bool(var, value);
return 0;
@ -373,10 +371,6 @@ static int git_pull_config(const char *var, const char *value, void *cb)
check_trust_level = 0;
}
status = git_gpg_config(var, value, cb);
if (status)
return status;
return git_default_config(var, value, cb);
}

5
builtin/push.c
View File

@ -508,11 +508,6 @@ static int git_push_config(const char *k, const char *v, void *cb)
{
const char *slot_name;
int *flags = cb;
int status;
status = git_gpg_config(k, v, NULL);
if (status)
return status;
if (!strcmp(k, "push.followtags")) {
if (git_config_bool(k, v))

4
builtin/receive-pack.c
View File

@ -134,10 +134,6 @@ static int receive_pack_config(const char *var, const char *value, void *cb)
{
int status = parse_hide_refs_config(var, value, "receive", &hidden_refs);
if (status)
return status;
status = git_gpg_config(var, value, NULL);
if (status)
return status;

2
builtin/send-pack.c
View File

@ -131,8 +131,6 @@ static void print_helper_status(struct ref *ref)
static int send_pack_config(const char *k, const char *v, void *cb)
{
git_gpg_config(k, v, NULL);
if (!strcmp(k, "push.gpgsign")) {
const char *value;
if (!git_config_get_value("push.gpgsign", &value)) {

5
builtin/tag.c
View File

@ -181,8 +181,6 @@ static const char tag_template_nocleanup[] =
static int git_tag_config(const char *var, const char *value, void *cb)
{
int status;
if (!strcmp(var, "tag.gpgsign")) {
config_sign_tag = git_config_bool(var, value);
return 0;
@ -195,9 +193,6 @@ static int git_tag_config(const char *var, const char *value, void *cb)
return 0;
}
status = git_gpg_config(var, value, cb);
if (status)
return status;
if (!strcmp(var, "tag.forcesignannotated")) {
force_sign_annotate = git_config_bool(var, value);
return 0;

10
builtin/verify-commit.c
View File

@ -52,14 +52,6 @@ static int verify_commit(const char *name, unsigned flags)
return run_gpg_verify((struct commit *)obj, flags);
}
static int git_verify_commit_config(const char *var, const char *value, void *cb)
{
int status = git_gpg_config(var, value, cb);
if (status)
return status;
return git_default_config(var, value, cb);
}
int cmd_verify_commit(int argc, const char **argv, const char *prefix)
{
int i = 1, verbose = 0, had_error = 0;
@ -70,7 +62,7 @@ int cmd_verify_commit(int argc, const char **argv, const char *prefix)
OPT_END()
};
git_config(git_verify_commit_config, NULL);
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, verify_commit_options,
verify_commit_usage, PARSE_OPT_KEEP_ARGV0);

10
builtin/verify-tag.c
View File

@ -19,14 +19,6 @@ static const char * const verify_tag_usage[] = {
NULL
};
static int git_verify_tag_config(const char *var, const char *value, void *cb)
{
int status = git_gpg_config(var, value, cb);
if (status)
return status;
return git_default_config(var, value, cb);
}
int cmd_verify_tag(int argc, const char **argv, const char *prefix)
{
int i = 1, verbose = 0, had_error = 0;
@ -39,7 +31,7 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
OPT_END()
};
git_config(git_verify_tag_config, NULL);
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, verify_tag_options,
verify_tag_usage, PARSE_OPT_KEEP_ARGV0);

5
fmt-merge-msg.c
View File

@ -20,8 +20,6 @@ static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
int fmt_merge_msg_config(const char *key, const char *value, void *cb)
{
int status = 0;
if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
int is_bool;
merge_log_config = git_config_bool_or_int(key, value, &is_bool);
@ -40,9 +38,6 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb)
string_list_append(&suppress_dest_patterns, value);
suppress_dest_pattern_seen = 1;
} else {
status = git_gpg_config(key, value, NULL);
if (status)
return status;
return git_default_config(key, value, cb);
}
return 0;

24
gpg-interface.c
View File

@ -10,6 +10,18 @@
#include "tempfile.h"
#include "alias.h"
static int git_gpg_config(const char *, const char *, void *);
static void gpg_interface_lazy_init(void)
{
static int done;
if (done)
return;
done = 1;
git_config(git_gpg_config, NULL);
}
static char *configured_signing_key;
static const char *ssh_default_key_command, *ssh_allowed_signers, *ssh_revocation_file;
static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED;
@ -633,6 +645,8 @@ int check_signature(struct signature_check *sigc,
struct gpg_format *fmt;
int status;
gpg_interface_lazy_init();
sigc->result = 'N';
sigc->trust_level = -1;
@ -696,11 +710,13 @@ int parse_signature(const char *buf, size_t size, struct strbuf *payload, struct
void set_signing_key(const char *key)
{
gpg_interface_lazy_init();
free(configured_signing_key);
configured_signing_key = xstrdup(key);
}
int git_gpg_config(const char *var, const char *value, void *cb UNUSED)
static int git_gpg_config(const char *var, const char *value, void *cb UNUSED)
{
struct gpg_format *fmt = NULL;
char *fmtname = NULL;
@ -889,6 +905,8 @@ static const char *get_ssh_key_id(void) {
/* Returns a textual but unique representation of the signing key */
const char *get_signing_key_id(void)
{
gpg_interface_lazy_init();
if (use_format->get_key_id) {
return use_format->get_key_id();
}
@ -899,6 +917,8 @@ const char *get_signing_key_id(void)
const char *get_signing_key(void)
{
gpg_interface_lazy_init();
if (configured_signing_key)
return configured_signing_key;
if (use_format->get_default_key) {
@ -924,6 +944,8 @@ const char *gpg_trust_level_to_str(enum signature_trust_level level)
int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key)
{
gpg_interface_lazy_init();
return use_format->sign_buffer(buffer, signature, signing_key);
}

1
gpg-interface.h
View File

@ -79,7 +79,6 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature,
*/
const char *gpg_trust_level_to_str(enum signature_trust_level level);
int git_gpg_config(const char *, const char *, void *);
void set_signing_key(const char *);
const char *get_signing_key(void);

4
sequencer.c
View File

@ -265,10 +265,6 @@ static int git_sequencer_config(const char *k, const char *v, void *cb)
if (opts->action == REPLAY_REVERT && !strcmp(k, "revert.reference"))
opts->commit_use_reference = git_config_bool(k, v);
status = git_gpg_config(k, v, NULL);
if (status)
return status;
return git_diff_basic_config(k, v, NULL);
}

10
t/t7031-verify-tag-signed-ssh.sh
View File

@ -200,4 +200,14 @@ test_expect_success GPGSSH 'verifying a forged tag with --format should fail sil
test_must_be_empty actual-forged
'
test_expect_success GPGSSH 'rev-list --format=%G' '
test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
git rev-list -1 --format="%G? %H" sixth-signed >actual &&
cat >expect <<-EOF &&
commit $(git rev-parse sixth-signed^0)
G $(git rev-parse sixth-signed^0)
EOF
test_cmp expect actual
'
test_done