summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Han-Wen Nienhuys <hanwen@google.com>2020-08-19 14:27:58 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-19 14:08:04 -0700
commite81153027857b0b0ed3dfa6a544df2beeac0cfce (patch)
tree91fb5e685935049d41bc0be408b27e2b33285f68 /mergetools
parentrefs: move gitdir into base ref_store (diff)
downloadtgif-e81153027857b0b0ed3dfa6a544df2beeac0cfce.tar.xz
refs: read FETCH_HEAD and MERGE_HEAD generically
The FETCH_HEAD and MERGE_HEAD refs must be stored in a file, regardless of the type of ref backend. This is because they can hold more than just a single ref. To accomodate them for alternate ref backends, read them from a file generically in refs_read_raw_ref() Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions