Skip to content

Commit 82a7ae1

Browse files
authored
Merge pull request #3415 from dscho/release-packs-before-fetching
git pull: release file handles to pack files before fetching
2 parents 0d6923f + 0e956ae commit 82a7ae1

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

builtin/pull.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "wt-status.h"
2727
#include "commit-reach.h"
2828
#include "sequencer.h"
29+
#include "packfile.h"
2930

3031
/**
3132
* Parses the value of --rebase. If value is a false value, returns
@@ -998,6 +999,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
998999
oidclr(&rebase_fork_point);
9991000
}
10001001

1002+
close_object_store(the_repository->objects);
10011003
if (run_fetch(repo, refspecs))
10021004
return 1;
10031005

commit-graph.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@ static void close_commit_graph_one(struct commit_graph *g)
713713
if (!g)
714714
return;
715715

716+
clear_commit_graph_data_slab(&commit_graph_data_slab);
716717
close_commit_graph_one(g->base_graph);
717718
free_commit_graph(g);
718719
}

0 commit comments

Comments
 (0)