Merge branch 'sb/submodule-merge-in-merge-recursive'

diff --git a/builtin/init-db.c b/builtin/init-db.c
index 2542c5244e91b68692c7ed371fa9976997ee8ff5..5a5844c153824b7d311a7ba6e878cfc320002d29 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -391,7 +391,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
                else if (get_shared_repository() == PERM_EVERYBODY)
                        xsnprintf(buf, sizeof(buf), "%d", OLD_PERM_EVERYBODY);
                else
-                       die("BUG: invalid value for shared_repository");
+                       BUG("invalid value for shared_repository");
                git_config_set("core.sharedrepository", buf);
                git_config_set("receive.denyNonFastforwards", "true");
        }