summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-03-23 17:20:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-26 17:05:46 (GMT)
commita80d72db2a73174b3f22142eb2014b33696fd795 (patch)
tree1278f03e0783b80ab18a3cb5b680c4af3e1ef974 /builtin/gc.c
parent97501e933a6d4d5a8567dbbb44fa3b4bff2ea298 (diff)
downloadgit-a80d72db2a73174b3f22142eb2014b33696fd795.zip
git-a80d72db2a73174b3f22142eb2014b33696fd795.tar.gz
git-a80d72db2a73174b3f22142eb2014b33696fd795.tar.bz2
object-store: move packed_git and packed_git_mru to object store
In a process with multiple repositories open, packfile accessors should be associated to a single repository and not shared globally. Move packed_git and packed_git_mru into the_repository and adjust callers to reflect this. [nd: while at there, wrap access to these two fields in get_packed_git() and get_packed_git_mru(). This allows us to lazily initialize these fields without caller doing that explicitly] Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/gc.c')
-rw-r--r--builtin/gc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index 77fa720..b00238c 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -11,6 +11,7 @@
*/
#include "builtin.h"
+#include "repository.h"
#include "config.h"
#include "tempfile.h"
#include "lockfile.h"
@@ -20,6 +21,7 @@
#include "argv-array.h"
#include "commit.h"
#include "packfile.h"
+#include "object-store.h"
#define FAILED_RUN "failed to run %s"
@@ -173,7 +175,7 @@ static int too_many_packs(void)
return 0;
prepare_packed_git();
- for (cnt = 0, p = packed_git; p; p = p->next) {
+ for (cnt = 0, p = get_packed_git(the_repository); p; p = p->next) {
if (!p->pack_local)
continue;
if (p->pack_keep)