Merge branch 'ef/setenv-putenv' into maint

[git.git] / builtin / init-db.c

diff --git a/builtin/init-db.c b/builtin/init-db.c
index 025aa47c804e4400cfa16ae8acd8dc2a5175e7c0..0dacb8b79c57cae2b789eb84d7cfbdb1654ba52f 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -347,11 +347,11 @@ static void separate_git_dir(const char *git_dir)
                const char *src;
 
                if (S_ISREG(st.st_mode))
-                       src = read_gitfile_gently(git_link);
+                       src = read_gitfile(git_link);
                else if (S_ISDIR(st.st_mode))
                        src = git_link;
                else
-                       die(_("unable to handle file type %d"), st.st_mode);
+                       die(_("unable to handle file type %d"), (int)st.st_mode);
 
                if (rename(src, git_dir))
                        die_errno(_("unable to move %s to %s"), src, git_dir);