From: Nguyễn Thái Ngọc Duy Date: Fri, 6 Aug 2010 03:21:40 +0000 (-0500) Subject: var: run setup_git_directory_gently() sooner X-Git-Tag: v1.7.3-rc0~33^2~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bc8c1a8a6b1cdffc19badc7272f552302b79d3e;p=git.git 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 Signed-off-by: Junio C Hamano Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/builtin/var.c b/builtin/var.c index 70fdb4dec..0744bb831 100644 --- a/builtin/var.c +++ b/builtin/var.c @@ -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); diff --git a/git.c b/git.c index 86b0a88d9..89bce6591 100644 --- a/git.c +++ b/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 },