Merge branch 'ew/svn-test-and-old-i18n'

diff --git a/builtin-init-db.c b/builtin-init-db.c
index bfdfc7b411fb463f06ba98f58c07f5e707813310..d1fa12a59efb34256b2cc80b03c637cc844d84ff 100644 (file)
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -132,8 +132,7 @@ static void copy_templates(const char *template_dir)
        }
        dir = opendir(template_path);
        if (!dir) {
-               fprintf(stderr, "warning: templates not found %s\n",
-                       template_dir);
+               warning("templates not found %s", template_dir);
                return;
        }
 
@@ -146,8 +145,8 @@ static void copy_templates(const char *template_dir)
 
        if (repository_format_version &&
            repository_format_version != GIT_REPO_VERSION) {
-               fprintf(stderr, "warning: not copying templates of "
-                       "a wrong format version %d from '%s'\n",
+               warning("not copying templates of "
+                       "a wrong format version %d from '%s'",
                        repository_format_version,
                        template_dir);
                closedir(dir);