diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:33 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:33 -0800 |
commit | cde555480b95c4311819dc1f7a38cc856a9aed23 (patch) | |
tree | afa74222656ad1c41fd10e48a7c8d40f484b87b2 /pack-objects.h | |
parent | 3b2f8a02fa9a9e68d5215828e1d97bb4f6996976 (diff) | |
parent | 36e7ed69de2c07a0214e79bde45714b92ac30ff2 (diff) |
Merge branch 'nd/the-index'
More codepaths become aware of working with in-core repository instance other than the default "the_repository". * nd/the-index: (22 commits) rebase-interactive.c: remove the_repository references rerere.c: remove the_repository references pack-*.c: remove the_repository references pack-check.c: remove the_repository references notes-cache.c: remove the_repository references line-log.c: remove the_repository reference diff-lib.c: remove the_repository references delta-islands.c: remove the_repository references cache-tree.c: remove the_repository references bundle.c: remove the_repository references branch.c: remove the_repository reference bisect.c: remove the_repository reference blame.c: remove implicit dependency the_repository sequencer.c: remove implicit dependency on the_repository sequencer.c: remove implicit dependency on the_index transport.c: remove implicit dependency on the_index notes-merge.c: remove implicit dependency the_repository notes-merge.c: remove implicit dependency on the_index list-objects.c: reduce the_repository references list-objects-filter.c: remove implicit dependency on the_index ...
Diffstat (limited to 'pack-objects.h')
-rw-r--r-- | pack-objects.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pack-objects.h b/pack-objects.h index dc869f26c2..3cd8d1f00a 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -5,6 +5,8 @@ #include "thread-utils.h" #include "pack.h" +struct repository; + #define DEFAULT_DELTA_CACHE_SIZE (256 * 1024 * 1024) #define OE_DFS_STATE_BITS 2 @@ -127,6 +129,7 @@ struct object_entry { }; struct packing_data { + struct repository *repo; struct object_entry *objects; uint32_t nr_objects, nr_alloc; @@ -163,7 +166,7 @@ struct packing_data { unsigned char *layer; }; -void prepare_packing_data(struct packing_data *pdata); +void prepare_packing_data(struct repository *r, struct packing_data *pdata); static inline void packing_data_lock(struct packing_data *pdata) { |