summaryrefslogtreecommitdiff
path: root/var.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-19 04:31:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-19 04:31:05 (GMT)
commit749be728d469e9a0acfdc020feff17c2da510083 (patch)
treebfaa47fb2b07de070b3bb5c58915faba3c3cb13d /var.c
parent925f9187697acfdbd7dbfe15e8420e1d3a671433 (diff)
downloadgit-749be728d469e9a0acfdc020feff17c2da510083.zip
git-749be728d469e9a0acfdc020feff17c2da510083.tar.gz
git-749be728d469e9a0acfdc020feff17c2da510083.tar.bz2
Delay "empty ident" errors until they really matter.
Previous one warned people upfront to encourage fixing their environment early, but some people just use repositories and git tools read-only without making any changes, and in such a case there is not much point insisting on them having a usable ident. This round attempts to move the error until either "git-var" asks for the ident explicitly or "commit-tree" wants to use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'var.c')
-rw-r--r--var.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/var.c b/var.c
index 59da56d..a57a33b 100644
--- a/var.c
+++ b/var.c
@@ -12,7 +12,7 @@ static const char var_usage[] = "git-var [-l | <variable>]";
struct git_var {
const char *name;
- const char *(*read)(void);
+ const char *(*read)(int);
};
static struct git_var git_vars[] = {
{ "GIT_COMMITTER_IDENT", git_committer_info },
@@ -24,7 +24,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(0));
}
}
@@ -35,7 +35,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(1);
break;
}
}