Merge branch 'jc/diff-test' into th/diff

diff --git a/config.c b/config.c
index d064f429cb4369ac08f7ad267b0b182112462b16..ec44827da4afbcf89a5eed37c7f557a7ffdce35d 100644 (file)
--- a/config.c
+++ b/config.c
@@ -280,17 +280,17 @@ int git_default_config(const char *var, const char *value)
        }
 
        if (!strcmp(var, "user.name")) {
-               safe_strncpy(git_default_name, value, sizeof(git_default_name));
+               strlcpy(git_default_name, value, sizeof(git_default_name));
                return 0;
        }
 
        if (!strcmp(var, "user.email")) {
-               safe_strncpy(git_default_email, value, sizeof(git_default_email));
+               strlcpy(git_default_email, value, sizeof(git_default_email));
                return 0;
        }
 
        if (!strcmp(var, "i18n.commitencoding")) {
-               safe_strncpy(git_commit_encoding, value, sizeof(git_commit_encoding));
+               strlcpy(git_commit_encoding, value, sizeof(git_commit_encoding));
                return 0;
        }
 
@@ -335,7 +335,7 @@ int git_config(config_fn_t fn)
 
        if (home) {
                char *user_config = strdup(mkpath("%s/.gitconfig", home));
-               if (access(user_config, R_OK) > 0)
+               if (!access(user_config, R_OK))
                        ret = git_config_from_file(fn, user_config);
                free(user_config);
        }