Suppress warnings from "git var -l"

For scripts using "git var -l" to read all logical variables at
once, not all per-variable warnings will be relevant.  So suppress
them.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ident.c b/ident.c
index 99f1c85ea5f5c83247f7affd3d801ff5c14393a6..26409b2a1b191765706265c2aa6d2ae163ba5bab 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -205,7 +205,7 @@ const char *fmt_ident(const char *name, const char *email,
                if ((warn_on_no_name || error_on_no_name) &&
                    name == git_default_name && env_hint) {
                        fprintf(stderr, env_hint, au_env, co_env);
                if ((warn_on_no_name || error_on_no_name) &&
                    name == git_default_name && env_hint) {
                        fprintf(stderr, env_hint, au_env, co_env);

-                       env_hint = NULL; /* warn only once, for "git var -l" */
+                       env_hint = NULL; /* warn only once */

                }
                if (error_on_no_name)
                        die("empty ident %s <%s> not allowed", name, email);
                }
                if (error_on_no_name)
                        die("empty ident %s <%s> not allowed", name, email);

diff --git a/var.c b/var.c
index 125c0d1676abae6de29de14061d1a24fd842712d..dacbaab259e8ea81f20053f131ba609cf402cc61 100644 (file)
--- a/var.c
+++ b/var.c
@@ -22,7 +22,7 @@ static void list_vars(void)
 {
        struct git_var *ptr;
        for (ptr = git_vars; ptr->read; ptr++)
 {
        struct git_var *ptr;
        for (ptr = git_vars; ptr->read; ptr++)

-               printf("%s=%s\n", ptr->name, ptr->read(IDENT_WARN_ON_NO_NAME));
+               printf("%s=%s\n", ptr->name, ptr->read(0));

 }
 
 static const char *read_var(const char *var)
 }
 
 static const char *read_var(const char *var)