[WIP PATCH 24/26] var: move up gitdir setup to run_builtin()
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:48:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin-var.c | 2 -- git.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/builtin-var.c b/builtin-var.c
index 2280518..f1e1fe3 100644
--- a/builtin-var.c
+++ b/builtin-var.c@@ -75,12 +75,10 @@ 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) { usage(var_usage); } - setup_git_directory_gently(&nongit); val = NULL; if (strcmp(argv[1], "-l") == 0) {
diff --git a/git.c b/git.c
index 8d23f75..7f715ba 100644
--- a/git.c
+++ b/git.c@@ -403,7 +403,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 },
--
1.7.0.195.g637a2