Merge branch 'kf/askpass-config'

diff --git a/builtin/var.c b/builtin/var.c
index 70fdb4dec7e8b0c56ded90ee7f086cc9f16293a1..0744bb83185289e26bd32b3b2ecaec717d8c75d7 100644 (file)
--- 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);