diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-25 22:56:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-25 22:56:20 +0200 |
| commit | 36628c56ed54b5a86aa9a17ed589fc0ee7f5bea5 (patch) | |
| tree | 3fadafc81f95d070092fb0a000b10dc02f5b1669 /object-store.h | |
| parent | Merge branch 'rj/send-email-validate-hook-count-messages' (diff) | |
| parent | repack: disable writing bitmaps when doing a local repack (diff) | |
| download | git-36628c56ed54b5a86aa9a17ed589fc0ee7f5bea5.tar.xz git-36628c56ed54b5a86aa9a17ed589fc0ee7f5bea5.zip | |
Merge branch 'ps/fix-geom-repack-with-alternates'
Geometric repacking ("git repack --geometric=<n>") in a repository
that borrows from an alternate object database had various corner
case bugs, which have been corrected.
* ps/fix-geom-repack-with-alternates:
repack: disable writing bitmaps when doing a local repack
repack: honor `-l` when calculating pack geometry
t/helper: allow chmtime to print verbosely without modifying mtime
pack-objects: extend test coverage of `--stdin-packs` with alternates
pack-objects: fix error when same packfile is included and excluded
pack-objects: fix error when packing same pack twice
pack-objects: split out `--stdin-packs` tests into separate file
repack: fix generating multi-pack-index with only non-local packs
repack: fix trying to use preferred pack in alternates
midx: fix segfault with no packs and invalid preferred pack
Diffstat (limited to 'object-store.h')
| -rw-r--r-- | object-store.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/object-store.h b/object-store.h index f9d225783a..4ac91e375d 100644 --- a/object-store.h +++ b/object-store.h @@ -56,6 +56,7 @@ KHASH_INIT(odb_path_map, const char * /* key: odb_path */, struct object_directory *, 1, fspathhash, fspatheq) void prepare_alt_odb(struct repository *r); +int has_alt_odb(struct repository *r); char *compute_alternate_path(const char *path, struct strbuf *err); struct object_directory *find_odb(struct repository *r, const char *obj_dir); typedef int alt_odb_fn(struct object_directory *, void *); |