diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-18 00:03:10 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-18 00:03:10 +0300 |
| commit | af5388d2ddb0bc7c22fbe698078f4ca07879d954 (patch) | |
| tree | 6829523f0d96f2014ea373a7aa5b35cdc3c45420 /fmt-merge-msg.c | |
| parent | d0732a8120d9cc62d8b6efa4ec48966f890f84b7 (diff) | |
| parent | cc5d1d32fd489f7eb98f762de303b499f2117638 (diff) | |
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 'fmt-merge-msg.c')
| -rw-r--r-- | fmt-merge-msg.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index 9609eb3cef..24cc44bdbc 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -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; |