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>
Nguyễn Thái Ngọc Duy committed
Aug 5, 2010 at 22:21 UTC
2bc8c1a8a6b1cdffc19badc7272f552302b79d3e
2 files changed
+3
-8
builtin/var.c
+2
-7
@@ -74,14 +74,9 @@ static int show_config(const char *var, const char *value, void *cb)
74
75
int cmd_var(int argc, const char **argv, const char *prefix)
76
{
77
- const char *val;
78
- int nongit;
79
- if (argc != 2) {
77
+ const char *val = NULL;
78
+ if (argc != 2)
79
usage(var_usage);
81
- }
82
-
83
- setup_git_directory_gently(&nongit);
84
- val = NULL;
80
81
if (strcmp(argv[1], "-l") == 0) {
82
git_config(show_config, NULL);
git.c
+1
-1
@@ -398,7 +398,7 @@ static void handle_internal_command(int argc, const char **argv)
398
{ "update-ref", cmd_update_ref, RUN_SETUP },
399
{ "update-server-info", cmd_update_server_info, RUN_SETUP },
400
{ "upload-archive", cmd_upload_archive },
401
- { "var", cmd_var },
401
+ { "var", cmd_var, RUN_SETUP_GENTLY },
402
{ "verify-tag", cmd_verify_tag, RUN_SETUP },
403
{ "version", cmd_version },
404
{ "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },