[PATCH v2 1/2] stash: get git_stash_config at the top level
- From
Thomas Gummerer <t.gummerer@gmail.com>
- Date
- Mar 3, 2020, 17:46 UTC
- Message-ID
- <20200303174613.3557960-1-t.gummerer@gmail.com>
- In-Reply-To
- <20200302181832.GA1571684@cat>
In the next commit we're adding another config variable to be read from 'git_stash_config', that is valid for the top level command instead of just a subset. Move the 'git_config' invocation for 'git_stash_config' to the top-level to prepare for that.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> --- builtin/stash.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/builtin/stash.c b/builtin/stash.c index 879fc5f368..f371db270c 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -712,7 +712,7 @@ static int git_stash_config(const char *var, const char *value, void *cb) show_patch = git_config_bool(var, value); return 0; } - return git_default_config(var, value, cb); + return git_diff_basic_config(var, value, cb); } static int show_stash(int argc, const char **argv, const char *prefix) @@ -749,7 +749,6 @@ static int show_stash(int argc, const char **argv, const char *prefix) * any options. */ if (revision_args.argc == 1) { - git_config(git_stash_config, NULL); if (show_stat) rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT; @@ -1573,7 +1572,7 @@ int cmd_stash(int argc, const char **argv, const char *prefix) trace_repo_setup(prefix); setup_work_tree(); - git_config(git_diff_basic_config, NULL); + git_config(git_stash_config, NULL); argc = parse_options(argc, argv, prefix, options, git_stash_usage, PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
-- 2.25.1.460.g2f268890c2