]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'kn/ref-transaction-symref' into kn/update-ref-symref
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 May 2024 16:38:59 +0000 (09:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 May 2024 16:38:59 +0000 (09:38 -0700)
* kn/ref-transaction-symref:
  refs: remove `create_symref` and associated dead code
  refs: rename `refs_create_symref()` to `refs_update_symref()`
  refs: use transaction in `refs_create_symref()`
  refs: add support for transactional symref updates
  refs: move `original_update_refname` to 'refs.c'
  refs: support symrefs in 'reference-transaction' hook
  files-backend: extract out `create_symref_lock()`
  refs: accept symref values in `ref_transaction_update()`

1  2 
branch.c
builtin/fast-import.c
builtin/fetch.c
builtin/receive-pack.c
refs/reftable-backend.c
t/t0610-reftable-basics.sh

diff --cc branch.c
Simple merge
Simple merge
diff --cc builtin/fetch.c
Simple merge
Simple merge
Simple merge
Simple merge