summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-19 07:45:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-19 07:45:35 (GMT)
commit8c59ba9a764f1ae1f8d176ea17c636183cfd7267 (patch)
tree5d3ae1da7adb0f2003518b0a85633b23a995240c /notes-merge.h
parentbca6aba72e85b87142ae02a0ea2a486f9581ead4 (diff)
parent581d2fd9f2d66ec5cb1859e0b6aef7c459a0d3a9 (diff)
downloadgit-8c59ba9a764f1ae1f8d176ea17c636183cfd7267.zip
git-8c59ba9a764f1ae1f8d176ea17c636183cfd7267.tar.gz
git-8c59ba9a764f1ae1f8d176ea17c636183cfd7267.tar.bz2
Merge branch 'jk/get-oid-indexed-object-name'
The codepath to parse :<path> that obtains the object name for an indexed object has been made more robust. * jk/get-oid-indexed-object-name: get_oid: handle NULL repo->index
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions