Merge branch 'jk/interop-test'

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 9ed8fbbfad71daf45381dbccf0aebe4a5b9af03d..f2c6953a39f6c1369725494cfc36b108cdb097a6 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1667,8 +1667,11 @@ static const char *unpack(int err_fd, struct shallow_info *si)
        }
 
        tmp_objdir = tmp_objdir_create();
-       if (!tmp_objdir)
+       if (!tmp_objdir) {
+               if (err_fd > 0)
+                       close(err_fd);
                return "unable to create temporary object directory";
+       }
        child.env = tmp_objdir_env(tmp_objdir);
 
        /*