Merge branch 'bs/maint-1.6.0-tree-walk-prefix'

diff --git a/ident.c b/ident.c
index b35504a8d25594a8d243ae7490733eae5a262712..99f1c85ea5f5c83247f7affd3d801ff5c14393a6 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -121,6 +121,7 @@ static int crud(unsigned char c)
                c == '<' ||
                c == '>' ||
                c == '"' ||
+               c == '\\' ||
                c == '\'';
 }
 
@@ -204,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);
-                       env_hint = NULL; /* warn only once, for "git-var -l" */
+                       env_hint = NULL; /* warn only once, for "git var -l" */
                }
                if (error_on_no_name)
                        die("empty ident %s <%s> not allowed", name, email);