Merge pull request #3415 from dscho/release-packs-before-fetching

git pull: release file handles to pack files before fetching
git-for-windows · Nov 16, 2021 · 293bf94 · 293bf94
2 parents 8dec82f + bcca7f3
commit 293bf94
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/builtin/pull.c b/builtin/pull.c
@@ -26,6 +26,7 @@
 #include "wt-status.h"
 #include "commit-reach.h"
 #include "sequencer.h"
+#include "packfile.h"
 
 /**
  * Parses the value of --rebase. If value is a false value, returns
@@ -1020,6 +1021,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 			oidclr(&rebase_fork_point);
 	}
 
+	close_object_store(the_repository->objects);
 	if (run_fetch(repo, refspecs))
 		return 1;
 

diff --git a/commit-graph.c b/commit-graph.c
@@ -713,6 +713,7 @@ static void close_commit_graph_one(struct commit_graph *g)
 	if (!g)
 		return;
 
+	clear_commit_graph_data_slab(&commit_graph_data_slab);
 	close_commit_graph_one(g->base_graph);
 	free_commit_graph(g);
 }