diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-11 13:09:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 13:09:55 +0900 |
| commit | 3a1ec60c43b1cad73fed8040aed7117900e9fd9d (patch) | |
| tree | 596ad53743761ff1ea09a80cf3f154aafa615f08 /builtin/gc.c | |
| parent | cf0b1793ead9428d88e6592e624c7cb222913c58 (diff) | |
| parent | 464416a2eaadf84d2bfdf795007863d03b222b7c (diff) | |
| download | git-3a1ec60c43b1cad73fed8040aed7117900e9fd9d.tar.gz | |
Merge branch 'sb/packfiles-in-repository'
Refactoring of the internal global data structure continues.
* sb/packfiles-in-repository:
packfile: keep prepare_packed_git() private
packfile: allow find_pack_entry to handle arbitrary repositories
packfile: add repository argument to find_pack_entry
packfile: allow reprepare_packed_git to handle arbitrary repositories
packfile: allow prepare_packed_git to handle arbitrary repositories
packfile: allow prepare_packed_git_one to handle arbitrary repositories
packfile: add repository argument to reprepare_packed_git
packfile: add repository argument to prepare_packed_git
packfile: add repository argument to prepare_packed_git_one
packfile: allow install_packed_git to handle arbitrary repositories
packfile: allow rearrange_packed_git to handle arbitrary repositories
packfile: allow prepare_packed_git_mru to handle arbitrary repositories
Diffstat (limited to 'builtin/gc.c')
| -rw-r--r-- | builtin/gc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index cef38e5427..3e67124eaa 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -174,7 +174,6 @@ static int too_many_packs(void) if (gc_auto_pack_limit <= 0) return 0; - prepare_packed_git(); for (cnt = 0, p = get_packed_git(the_repository); p; p = p->next) { if (!p->pack_local) continue; @@ -481,7 +480,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix) return error(FAILED_RUN, rerere.argv[0]); report_garbage = report_pack_garbage; - reprepare_packed_git(); + reprepare_packed_git(the_repository); if (pack_garbage.nr > 0) clean_pack_garbage(); |