mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/gpg-lazy-init'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2023-03-17 14:03:10 -07:00
parent d0732a8120 cc5d1d32fd
commit af5388d2dd
17 changed files with 37 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/commit-tree.c
View File

@ -38,14 +38,6 @@ static void new_parent(struct commit *parent, struct commit_list **parents_p)
commit_list_insert(parent, parents_p);
}
static int commit_tree_config(const char *var, const char *value, void *cb)
{
int status = git_gpg_config(var, value, NULL);
if (status)
return status;
return git_default_config(var, value, cb);
}
static int parse_parent_arg_callback(const struct option *opt,
const char *arg, int unset)
{
@ -122,7 +114,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
OPT_END()
};
git_config(commit_tree_config, NULL);
git_config(git_default_config, NULL);
if (argc < 2 || !strcmp(argv[1], "-h"))
usage_with_options(commit_tree_usage, options);