Fix off-by-one error in git-merge

diff --git a/init-db.c b/init-db.c
index 1fb3f7fa79136f296ece9e04f6fdbf34bb40eeeb..902bdfaafb53e15382c901936a1ccd2fec90f0f3 100644 (file)
--- a/init-db.c
+++ b/init-db.c
@@ -226,7 +226,7 @@ int main(int argc, char **argv)
        /*
         * Set up the default .git directory contents
         */
-       git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+       git_dir = getenv(GIT_DIR_ENVIRONMENT);
        if (!git_dir) {
                git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
                fprintf(stderr, "defaulting to local storage area\n");
@@ -249,5 +249,7 @@ int main(int argc, char **argv)
        }
        strcpy(path+len, "/pack");
        safe_create_dir(path);
+       strcpy(path+len, "/info");
+       safe_create_dir(path);
        return 0;
 }