var: run setup_git_directory_gently() sooner
Part of a campaign to make repository-local configuration available early (simplifying the startup sequence for built-in commands). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f0ef6a6eff
commit
2bc8c1a8a6
@ -74,14 +74,9 @@ static int show_config(const char *var, const char *value, void *cb)
|
||||
|
||||
int cmd_var(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
const char *val;
|
||||
int nongit;
|
||||
if (argc != 2) {
|
||||
const char *val = NULL;
|
||||
if (argc != 2)
|
||||
usage(var_usage);
|
||||
}
|
||||
|
||||
setup_git_directory_gently(&nongit);
|
||||
val = NULL;
|
||||
|
||||
if (strcmp(argv[1], "-l") == 0) {
|
||||
git_config(show_config, NULL);
|
||||
|
2
git.c
2
git.c
@ -398,7 +398,7 @@ static void handle_internal_command(int argc, const char **argv)
|
||||
{ "update-ref", cmd_update_ref, RUN_SETUP },
|
||||
{ "update-server-info", cmd_update_server_info, RUN_SETUP },
|
||||
{ "upload-archive", cmd_upload_archive },
|
||||
{ "var", cmd_var },
|
||||
{ "var", cmd_var, RUN_SETUP_GENTLY },
|
||||
{ "verify-tag", cmd_verify_tag, RUN_SETUP },
|
||||
{ "version", cmd_version },
|
||||
{ "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
|
||||
|
Loading…
Reference in New Issue
Block a user