Merge branch 'rs/copy-array'

[git/git.git] / packfile.c

diff --git a/packfile.c b/packfile.c
index 2ff570f..c0d83fd 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -16,6 +16,7 @@
 #include "tree.h"
 #include "object-store.h"
 #include "midx.h"
 #include "tree.h"
 #include "object-store.h"
 #include "midx.h"

+#include "commit-graph.h"

 
 char *odb_pack_name(struct strbuf *buf,
                    const unsigned char *sha1,
 
 char *odb_pack_name(struct strbuf *buf,
                    const unsigned char *sha1,


@@ -336,7 +337,7 @@ void close_pack(struct packed_git *p)
        close_pack_index(p);
 }
 
        close_pack_index(p);
 }
 

-void close_all_packs(struct raw_object_store *o)
+void close_object_store(struct raw_object_store *o)

 {
        struct packed_git *p;
 
 {
        struct packed_git *p;
 


@@ -350,6 +351,8 @@ void close_all_packs(struct raw_object_store *o)
                close_midx(o->multi_pack_index);
                o->multi_pack_index = NULL;
        }
                close_midx(o->multi_pack_index);
                o->multi_pack_index = NULL;
        }

+
+       close_commit_graph(o);

 }
 
 /*
 }
 
 /*


@@ -640,7 +643,7 @@ unsigned char *use_pack(struct packed_git *p,
                        while (packed_git_limit < pack_mapped
                                && unuse_one_window(p))
                                ; /* nothing */
                        while (packed_git_limit < pack_mapped
                                && unuse_one_window(p))
                                ; /* nothing */

-                       win->base = xmmap(NULL, win->len,
+                       win->base = xmmap_gently(NULL, win->len,

                                PROT_READ, MAP_PRIVATE,
                                p->pack_fd, win->offset);
                        if (win->base == MAP_FAILED)
                                PROT_READ, MAP_PRIVATE,
                                p->pack_fd, win->offset);
                        if (win->base == MAP_FAILED)