]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bf/set-head-symref' into bf/fetch-set-head-config
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Nov 2024 13:49:05 +0000 (22:49 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Nov 2024 13:49:05 +0000 (22:49 +0900)
* bf/set-head-symref:
  fetch set_head: handle mirrored bare repositories
  fetch: set remote/HEAD if it does not exist
  refs: add create_only option to refs_update_symref_extended
  refs: add TRANSACTION_CREATE_EXISTS error
  remote set-head: better output for --auto
  remote set-head: refactor for readability
  refs: atomically record overwritten ref in update_symref
  refs: standardize output of refs_read_symbolic_ref
  t/t5505-remote: test failure of set-head
  t/t5505-remote: set default branch to main

1  2 
builtin/fetch.c
builtin/remote.c
refs.c
refs/reftable-backend.c
t/t7900-maintenance.sh
t/t9210-scalar.sh
t/t9211-scalar-clone.sh

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