X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=config.c;h=5195de10c9289a25053756ce799e654d5e01483e;hb=6304c29d518206b0780291a02f94f435abf82d74;hp=0e22c7a6423c211b2e2a95b0535b85dc9f234a1f;hpb=486d1a56443fb19770a7d1abe08f1f4e9e44534d;p=git.git

diff --git a/config.c b/config.c
index 0e22c7a64..5195de10c 100644
--- a/config.c
+++ b/config.c
@@ -448,6 +448,8 @@ int git_default_config(const char *var, const char *value)
 		if (!value)
 			return config_error_nonbool(var);
 		strlcpy(git_default_name, value, sizeof(git_default_name));
+		if (git_default_email[0])
+			user_ident_explicitly_given = 1;
 		return 0;
 	}
 
@@ -455,6 +457,8 @@ int git_default_config(const char *var, const char *value)
 		if (!value)
 			return config_error_nonbool(var);
 		strlcpy(git_default_email, value, sizeof(git_default_email));
+		if (git_default_name[0])
+			user_ident_explicitly_given = 1;
 		return 0;
 	}
 
@@ -698,7 +702,7 @@ static int store_write_section(int fd, const char* key)
 	if (dot) {
 		strbuf_addf(&sb, "[%.*s \"", (int)(dot - key), key);
 		for (i = dot - key + 1; i < store.baselen; i++) {
-			if (key[i] == '"')
+			if (key[i] == '"' || key[i] == '\\')
 				strbuf_addch(&sb, '\\');
 			strbuf_addch(&sb, key[i]);
 		}