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 /bulk-checkin.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 'bulk-checkin.c')
| -rw-r--r-- | bulk-checkin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c index e5ce2a7954..de1f4040c7 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -3,6 +3,7 @@ */ #include "cache.h" #include "bulk-checkin.h" +#include "repository.h" #include "csum-file.h" #include "pack.h" #include "strbuf.h" @@ -57,7 +58,7 @@ clear_exit: strbuf_release(&packname); /* Make objects we just wrote available to ourselves */ - reprepare_packed_git(); + reprepare_packed_git(the_repository); } static int already_written(struct bulk_checkin_state *state, struct object_id *oid) |