projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mm/verify-filename-fix'
[git.git]
/
builtin
/
var.c
diff --git
a/builtin/var.c
b/builtin/var.c
index 99d068a5327255f36c8e415ecb8d0cf98cbbe180..aedbb53a2da5e02b2c8fc29a1a4dc22dc76fbefb 100644
(file)
--- a/
builtin/var.c
+++ b/
builtin/var.c
@@
-11,7
+11,7
@@
static const char *editor(int flag)
{
const char *pgm = git_editor();
{
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;
die("Terminal is dumb, but EDITOR unset");
return pgm;
@@
-55,7
+55,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 = 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;
}
}
break;
}
}