git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
[gitweb.git] / var.c
diff --git a/var.c b/var.c
index e585e59d315061e2e82ea8a23843c128bcce2555..0de0efa2aa3b216a0bc846135a54ed0dd0549f8b 100644 (file)
--- a/var.c
+++ b/var.c
@@ -21,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(0));
+               printf("%s=%s\n", ptr->name, ptr->read(IDENT_WARN_ON_NO_NAME));
        }
 }
 
@@ -32,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(1);
+                       val = ptr->read(IDENT_ERROR_ON_NO_NAME);
                        break;
                }
        }
@@ -67,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;
 }