diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-11-19 12:24:33 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-11-19 12:24:33 +0900 |
| commit | b8558e6abd8715cc9557abf10e8768e475fdeb5e (patch) | |
| tree | 7855252e56792e6acce38a79e4897eb6deee925e /reftable/merged.h | |
| parent | 8f8d6eee531b3fa1a8ef14f169b0cb5035f7a772 (diff) | |
| parent | 988e7f5e952bbb7b6ae885f4da744f536f22693f (diff) | |
| download | git-b8558e6abd8715cc9557abf10e8768e475fdeb5e.tar.gz | |
Merge branch 'ps/reftable-detach' into ps/reftable-iterator-reuse
* ps/reftable-detach:
reftable/system: provide thin wrapper for lockfile subsystem
reftable/stack: drop only use of `get_locked_file_path()`
reftable/system: provide thin wrapper for tempfile subsystem
reftable/stack: stop using `fsync_component()` directly
reftable/system: stop depending on "hash.h"
reftable: explicitly handle hash format IDs
reftable/system: move "dir.h" to its only user
Diffstat (limited to 'reftable/merged.h')
| -rw-r--r-- | reftable/merged.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/reftable/merged.h b/reftable/merged.h index 89bd0c4b35..0b7d939e92 100644 --- a/reftable/merged.h +++ b/reftable/merged.h @@ -10,11 +10,12 @@ https://developers.google.com/open-source/licenses/bsd #define MERGED_H #include "system.h" +#include "reftable-basics.h" struct reftable_merged_table { struct reftable_reader **readers; size_t readers_len; - uint32_t hash_id; + enum reftable_hash hash_id; /* If unset, produce deletions. This is useful for compaction. For the * full stack, deletions should be produced. */ |