diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-17 14:03:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-17 14:03:10 -0700 |
| commit | af5388d2ddb0bc7c22fbe698078f4ca07879d954 (patch) | |
| tree | 6829523f0d96f2014ea373a7aa5b35cdc3c45420 /builtin/am.c | |
| parent | d0732a8120d9cc62d8b6efa4ec48966f890f84b7 (diff) | |
| parent | cc5d1d32fd489f7eb98f762de303b499f2117638 (diff) | |
| download | git-af5388d2ddb0bc7c22fbe698078f4ca07879d954.tar.gz | |
Merge branch 'jc/gpg-lazy-init'
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
Diffstat (limited to 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/builtin/am.c b/builtin/am.c index 3b5ea50cc5..5e6b237c42 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -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); |