Merge branch 'ao/p4-d-f-conflict-recover'

[thirdparty/git.git] / midx.c

diff --git a/midx.c b/midx.c
index a520e263956086a988b77d6e22a7262c9aeba9b8..9a61d3b37d9a3607e6a53258760c9bfa7e732075 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -72,9 +72,9 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
        FREE_AND_NULL(midx_name);
 
        midx_map = xmmap(NULL, midx_size, PROT_READ, MAP_PRIVATE, fd, 0);
+       close(fd);
 
        FLEX_ALLOC_STR(m, object_dir, object_dir);
-       m->fd = fd;
        m->data = midx_map;
        m->data_len = midx_size;
        m->local = local;
@@ -190,8 +190,6 @@ void close_midx(struct multi_pack_index *m)
                return;
 
        munmap((unsigned char *)m->data, m->data_len);
-       close(m->fd);
-       m->fd = -1;
 
        for (i = 0; i < m->num_packs; i++) {
                if (m->packs[i])