Skip to content

git pull: release file handles to pack files before fetching #3415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 8, 2021
Merged

git pull: release file handles to pack files before fetching #3415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aade3ca
commit-graph: when closing the graph, also release the slab
dscho Sep 7, 2021
0e956ae
pull: release packs before fetching
dscho Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions builtin/pull.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -998,6 +999,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;

Expand Down
1 change: 1 addition & 0 deletions commit-graph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Member Author

@dscho dscho Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@derrickstolee could I ask you to look over this change, to see whether it is sound?

Copy link

@derrickstolee derrickstolee Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. If we are closing the commit-graph, then the graph might change when we reopen it, leading to different graph_pos values.

close_commit_graph_one(g->base_graph);
free_commit_graph(g);
}
Expand Down