Make sure the empty tree exists when needed in merge-recursive.

diff --git a/builtin-init-db.c b/builtin-init-db.c
index 23b7714f894019c7d59fc9ede00d83c008d6bc89..235a0ee48f2c5ce09c63a949358eb16cde05332d 100644 (file)
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -311,6 +311,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
                 */
                sprintf(buf, "%d", shared_repository);
                git_config_set("core.sharedrepository", buf);
+               git_config_set("receive.denyNonFastforwards", "true");
        }
 
        return 0;