X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=var.c;h=0de0efa2aa3b216a0bc846135a54ed0dd0549f8b;hb=396ccf1fcb91f31d5060555cbffc35bf24172a35;hp=51cf86a5843acc3b6bc3d8c4be9fec0fdd0a0df5;hpb=29504118f8528f658fd0bfc02d8d78d4c01dc2cc;p=git.git

diff --git a/var.c b/var.c
index 51cf86a58..0de0efa2a 100644
--- a/var.c
+++ b/var.c
@@ -4,15 +4,12 @@
  * Copyright (C) Eric Biederman, 2005
  */
 #include "cache.h"
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
 
 static const char var_usage[] = "git-var [-l | <variable>]";
 
 struct git_var {
 	const char *name;
-	char *(*read)(void);
+	const char *(*read)(int);
 };
 static struct git_var git_vars[] = {
 	{ "GIT_COMMITTER_IDENT", git_committer_info },
@@ -24,7 +21,7 @@ static void list_vars(void)
 {
 	struct git_var *ptr;
 	for(ptr = git_vars; ptr->read; ptr++) {
-		printf("%s=%s\n", ptr->name, ptr->read());
+		printf("%s=%s\n", ptr->name, ptr->read(IDENT_WARN_ON_NO_NAME));
 	}
 }
 
@@ -35,7 +32,7 @@ static const char *read_var(const char *var)
 	val = NULL;
 	for(ptr = git_vars; ptr->read; ptr++) {
 		if (strcmp(var, ptr->name) == 0) {
-			val = ptr->read();
+			val = ptr->read(IDENT_ERROR_ON_NO_NAME);
 			break;
 		}
 	}
@@ -57,7 +54,8 @@ int main(int argc, char **argv)
 	if (argc != 2) {
 		usage(var_usage);
 	}
-	setup_ident();
+
+	setup_git_directory();
 	val = NULL;
 
 	if (strcmp(argv[1], "-l") == 0) {
@@ -69,8 +67,8 @@ int main(int argc, char **argv)
 	val = read_var(argv[1]);
 	if (!val)
 		usage(var_usage);
-	
+
 	printf("%s\n", val);
-	
+
 	return 0;
 }