undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stash: get git_stash_config at the top level

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Gummerer 2020-03-03 17:46:12 +00:00 committed by Junio C Hamano
parent 2d2118b814
commit b0c7362d19
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/stash.c
View File

@ -712,7 +712,7 @@ static int git_stash_config(const char *var, const char *value, void *cb)
show_patch = git_config_bool(var, value); show_patch = git_config_bool(var, value);
return 0; 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) 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. * any options.
*/ */
if (revision_args.argc == 1) { if (revision_args.argc == 1) {
git_config(git_stash_config, NULL);
if (show_stat) if (show_stat)
rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT; 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); trace_repo_setup(prefix);
setup_work_tree(); 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, argc = parse_options(argc, argv, prefix, options, git_stash_usage,
PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH); PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);