tree 09d7657d5d28cbb85e41c9684c398af60a103f4f
parent 8ac5444cba9349a5f89e64e1774ea9d6740a5add
parent 127b48f99fb39736b3b8da1a81ec4f7dcf1d7f63
author Junio C Hamano <gitster@pobox.com> 1550110721 -0800
committer Junio C Hamano <gitster@pobox.com> 1550110721 -0800

Merge branch 'nd/get-oid-with-context-returns-an-enum'

* nd/get-oid-with-context-returns-an-enum:
  get_oid_with_context(): match prototype and implementation