diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-17 21:03:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-17 21:03:10 (GMT) |
| commit | af5388d2ddb0bc7c22fbe698078f4ca07879d954 (patch) | |
| tree | 6829523f0d96f2014ea373a7aa5b35cdc3c45420 /builtin/merge.c | |
| parent | d0732a8120d9cc62d8b6efa4ec48966f890f84b7 (diff) | |
| parent | cc5d1d32fd489f7eb98f762de303b499f2117638 (diff) | |
| download | git-af5388d2ddb0bc7c22fbe698078f4ca07879d954.zip git-af5388d2ddb0bc7c22fbe698078f4ca07879d954.tar.gz git-af5388d2ddb0bc7c22fbe698078f4ca07879d954.tar.bz2 | |
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/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 7347b73..19c31d4 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -663,9 +663,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); } |