diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-14 17:53:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-14 17:53:48 -0800 |
| commit | 82522a9e2ce3e2b400a217a21b05204a2034edbc (patch) | |
| tree | f893beca295e99602b5cdd57a38263827ca3e0f3 /reftable/stack.c | |
| parent | c3fffcfe8e6c3bfbe358366c973a6109fb95d4e6 (diff) | |
| parent | 017bd8923986acd4992fd21f3451fdd15ec6edce (diff) | |
| download | git-82522a9e2ce3e2b400a217a21b05204a2034edbc.tar.xz | |
Merge branch 'kn/reflog-migration-fix-followup'
Code clean-up.
* kn/reflog-migration-fix-followup:
reftable: prevent 'update_index' changes after adding records
refs: use 'uint64_t' for 'ref_update.index'
refs: mark `ref_transaction_update_reflog()` as static
Diffstat (limited to 'reftable/stack.c')
| -rw-r--r-- | reftable/stack.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/reftable/stack.c b/reftable/stack.c index f7c1845e15..6c4e8be19b 100644 --- a/reftable/stack.c +++ b/reftable/stack.c @@ -1058,8 +1058,10 @@ static int stack_write_compact(struct reftable_stack *st, for (size_t i = first; i <= last; i++) st->stats.bytes += st->readers[i]->size; - reftable_writer_set_limits(wr, st->readers[first]->min_update_index, - st->readers[last]->max_update_index); + err = reftable_writer_set_limits(wr, st->readers[first]->min_update_index, + st->readers[last]->max_update_index); + if (err < 0) + goto done; err = reftable_merged_table_new(&mt, st->readers + first, subtabs_len, st->opts.hash_id); |