]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/reftable-concurrent-writes'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2024 23:16:14 +0000 (16:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2024 23:16:14 +0000 (16:16 -0700)
Give timeout to the locking code to write to reftable.

* ps/reftable-concurrent-writes:
  refs/reftable: reload locked stack when preparing transaction
  reftable/stack: allow locking of outdated stacks
  refs/reftable: introduce "reftable.lockTimeout"

1  2 
refs/reftable-backend.c
t/unit-tests/t-reftable-stack.c

Simple merge
Simple merge