Merge branch 'fc/config-editor'

diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c
index f7e04c45f997d433a5af4352f3dd0dee11dd43fa..a970b39505b5dda0bfa32a1a9c14ad676d28ec92 100644 (file)
--- a/builtin-receive-pack.c
+++ b/builtin-receive-pack.c
@@ -244,7 +244,7 @@ static void warn_unconfigured_deny(void)
 {
        int i;
        for (i = 0; i < ARRAY_SIZE(warn_unconfigured_deny_msg); i++)
-               warning(warn_unconfigured_deny_msg[i]);
+               warning("%s", warn_unconfigured_deny_msg[i]);
 }
 
 static char *warn_unconfigured_deny_delete_current_msg[] = {
@@ -270,7 +270,7 @@ static void warn_unconfigured_deny_delete_current(void)
        for (i = 0;
             i < ARRAY_SIZE(warn_unconfigured_deny_delete_current_msg);
             i++)
-               warning(warn_unconfigured_deny_delete_current_msg[i]);
+               warning("%s", warn_unconfigured_deny_delete_current_msg[i]);
 }
 
 static const char *update(struct command *cmd)
@@ -675,7 +675,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
        setup_path();
 
        if (!enter_repo(dir, 0))
-               die("'%s': unable to chdir or not a git archive", dir);
+               die("'%s' does not appear to be a git repository", dir);
 
        if (is_repository_shallow())
                die("attempt to push into a shallow repository");