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 /builtin/pull.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 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 963a47f0b8..56f679d94a 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -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); } |