summaryrefslogtreecommitdiff
path: root/builtin/var.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/var.c')
-rw-r--r--builtin/var.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/var.c b/builtin/var.c
index 0744bb8318..6c6f46b4ae 100644
--- a/builtin/var.c
+++ b/builtin/var.c
@@ -3,8 +3,8 @@
*
* Copyright (C) Eric Biederman, 2005
*/
-#include "cache.h"
-#include "exec_cmd.h"
+#include "builtin.h"
+#include "config.h"
static const char var_usage[] = "git var (-l | <variable>)";
@@ -12,7 +12,7 @@ static const char *editor(int flag)
{
const char *pgm = git_editor();
- if (!pgm && flag & IDENT_ERROR_ON_NO_NAME)
+ if (!pgm && flag & IDENT_STRICT)
die("Terminal is dumb, but EDITOR unset");
return pgm;
@@ -56,7 +56,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(IDENT_ERROR_ON_NO_NAME);
+ val = ptr->read(IDENT_STRICT);
break;
}
}