Merge refs/heads/master from .

diff --git a/receive-pack.c b/receive-pack.c
index 8d6faaaa9c995f5552549557176a48303a0820ac..06857eb77fef93788f54d17cca68924f5213c9db 100644 (file)
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -106,6 +106,8 @@ static int update(const char *name,
                return error("unpack should have generated %s, "
                             "but I can't find it!", new_hex);
 
+       safe_create_leading_directories(lock_name);
+
        newfd = open(lock_name, O_CREAT | O_EXCL | O_WRONLY, 0666);
        if (newfd < 0)
                return error("unable to create %s (%s)",
@@ -267,7 +269,7 @@ int main(int argc, char **argv)
 
        /* If we have a ".git" directory, chdir to it */
        chdir(".git");
-       setenv("GIT_DIR", ".", 1);
+       putenv("GIT_DIR=.");
 
        if (access("objects", X_OK) < 0 || access("refs/heads", X_OK) < 0)
                die("%s doesn't appear to be a git directory", dir);