X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=var.c;h=59da56da0f2f1dc9593ef16433fe5bb2db38e280;hb=5b5d4d9e1b31997b3179e6a253d47b7eea03d0fa;hp=488ec5147a227444490e3d73ce03e1acd786f998;hpb=89ab859e9452cbc8f1f15afab52257e9b789c899;p=git.git

diff --git a/var.c b/var.c
index 488ec514..59da56da 100644
--- a/var.c
+++ b/var.c
@@ -8,11 +8,11 @@
 #include <errno.h>
 #include <string.h>
 
-static char *var_usage = "git-var [-l | <variable>]";
+static const char var_usage[] = "git-var [-l | <variable>]";
 
 struct git_var {
 	const char *name;
-	char *(*read)(void);
+	const char *(*read)(void);
 };
 static struct git_var git_vars[] = {
 	{ "GIT_COMMITTER_IDENT", git_committer_info },
@@ -42,19 +42,32 @@ static const char *read_var(const char *var)
 	return val;
 }
 
+static int show_config(const char *var, const char *value)
+{
+	if (value)
+		printf("%s=%s\n", var, value);
+	else
+		printf("%s\n", var);
+	return git_default_config(var, value);
+}
+
 int main(int argc, char **argv)
 {
 	const char *val;
 	if (argc != 2) {
 		usage(var_usage);
 	}
+
+	setup_git_directory();
 	setup_ident();
 	val = NULL;
 
 	if (strcmp(argv[1], "-l") == 0) {
+		git_config(show_config);
 		list_vars();
 		return 0;
 	}
+	git_config(git_default_config);
 	val = read_var(argv[1]);
 	if (!val)
 		usage(var_usage);