]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/pseudo-refs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jan 2024 21:51:30 +0000 (13:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jan 2024 21:51:30 +0000 (13:51 -0800)
Assorted changes around pseudoref handling.

* ps/pseudo-refs:
  bisect: consistently write BISECT_EXPECTED_REV via the refdb
  refs: complete list of special refs
  refs: propagate errno when reading special refs fails
  wt-status: read HEAD and ORIG_HEAD via the refdb

1  2 
builtin/bisect.c
refs.c
t/t1403-show-ref.sh
t/t6030-bisect-porcelain.sh
wt-status.c

Simple merge
diff --cc refs.c
Simple merge
Simple merge
Simple merge
diff --cc wt-status.c
Simple merge