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

drop pure pass-through config callbacks

Browse Source 
Commit fd2d4c135e (gpg-interface: lazily initialize and read the
configuration, 2023-02-09) shrunk a few custom config callbacks so that
they are just one-liners of:

  return git_default_config(...);

We can drop them entirely and replace them direct calls of
git_default_config() intead. This makes the code a little shorter and
easier to understand (with the downside being that if they do grow
custom options again later, we'll have to recreate the functions).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2023-02-26 17:40:46 -05:00
committed by Junio C Hamano
parent fd2d4c135e
commit cc5d1d32fd
4 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/am.c
View File

@ -2312,11 +2312,6 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar
return 0; return 0;
} }
static int git_am_config(const char *k, const char *v, void *cb UNUSED)
{
return git_default_config(k, v, NULL);
}
int cmd_am(int argc, const char **argv, const char *prefix) int cmd_am(int argc, const char **argv, const char *prefix)
{ {
struct am_state state; struct am_state state;
@ -2440,7 +2435,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
if (argc == 2 && !strcmp(argv[1], "-h")) if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(usage, options); usage_with_options(usage, options);
git_config(git_am_config, NULL); git_config(git_default_config, NULL);
am_state_init(&state); am_state_init(&state);

7
builtin/commit-tree.c
View File

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

7
builtin/verify-commit.c
View File

@ -52,11 +52,6 @@ static int verify_commit(const char *name, unsigned flags)
return run_gpg_verify((struct commit *)obj, flags); return run_gpg_verify((struct commit *)obj, flags);
} }
static int git_verify_commit_config(const char *var, const char *value, void *cb)
{
return git_default_config(var, value, cb);
}
int cmd_verify_commit(int argc, const char **argv, const char *prefix) int cmd_verify_commit(int argc, const char **argv, const char *prefix)
{ {
int i = 1, verbose = 0, had_error = 0; int i = 1, verbose = 0, had_error = 0;
@ -67,7 +62,7 @@ int cmd_verify_commit(int argc, const char **argv, const char *prefix)
OPT_END() OPT_END()
}; };
git_config(git_verify_commit_config, NULL); git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, verify_commit_options, argc = parse_options(argc, argv, prefix, verify_commit_options,
verify_commit_usage, PARSE_OPT_KEEP_ARGV0); verify_commit_usage, PARSE_OPT_KEEP_ARGV0);

7
builtin/verify-tag.c
View File

@ -19,11 +19,6 @@ static const char * const verify_tag_usage[] = {
NULL NULL
}; };
static int git_verify_tag_config(const char *var, const char *value, void *cb)
{
return git_default_config(var, value, cb);
}
int cmd_verify_tag(int argc, const char **argv, const char *prefix) int cmd_verify_tag(int argc, const char **argv, const char *prefix)
{ {
int i = 1, verbose = 0, had_error = 0; int i = 1, verbose = 0, had_error = 0;
@ -36,7 +31,7 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
OPT_END() OPT_END()
}; };
git_config(git_verify_tag_config, NULL); git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, verify_tag_options, argc = parse_options(argc, argv, prefix, verify_tag_options,
verify_tag_usage, PARSE_OPT_KEEP_ARGV0); verify_tag_usage, PARSE_OPT_KEEP_ARGV0);