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/commit.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/commit.c')
| -rw-r--r-- | builtin/commit.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 985a0445b7..f71ed41bf5 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -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); } |