Merge branch 'js/init-db-update-for-mingw'

diff --git a/builtin/mktree.c b/builtin/mktree.c
index 2dc4ad6ba8f227a6a8a46bac62048959220411ec..94e82b8504f7da5bed50d81771cefe3445b98ece 100644 (file)
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -98,7 +98,7 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss
 
        *ntr++ = 0; /* now at the beginning of SHA1 */
 
-       path = ntr + 41;  /* at the beginning of name */
+       path = (char *)p + 1;  /* at the beginning of name */
        if (!nul_term_line && path[0] == '"') {
                struct strbuf p_uq = STRBUF_INIT;
                if (unquote_c_style(&p_uq, path, NULL))