Merge branch 'nd/get-oid-with-context-returns-an-enum'
commitc73472a8deb9dc194d05747dda3061c6324750e4
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 02:18:41 +0000 (13 18:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Feb 2019 02:18:41 +0000 (13 18:18 -0800)
tree09d7657d5d28cbb85e41c9684c398af60a103f4f
parent8ac5444cba9349a5f89e64e1774ea9d6740a5add
parent127b48f99fb39736b3b8da1a81ec4f7dcf1d7f63
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