diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-25 23:56:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-25 23:56:20 +0300 |
| commit | 36628c56ed54b5a86aa9a17ed589fc0ee7f5bea5 (patch) | |
| tree | 3fadafc81f95d070092fb0a000b10dc02f5b1669 /object-file.c | |
| parent | c4c9d5586fed1b994ef579a0862b86ff36afcbe8 (diff) | |
| parent | d85cd1877777aa92c73868b9e86516d4be04b4a0 (diff) | |
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-file.c')
| -rw-r--r-- | object-file.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/object-file.c b/object-file.c index 8163ddbadd..af18e38527 100644 --- a/object-file.c +++ b/object-file.c @@ -953,6 +953,12 @@ void prepare_alt_odb(struct repository *r) r->objects->loaded_alternates = 1; } +int has_alt_odb(struct repository *r) +{ + prepare_alt_odb(r); + return !!r->objects->odb->next; +} + /* Returns 1 if we have successfully freshened the file, 0 otherwise. */ static int freshen_file(const char *fn) { |