Commit c73472a8 authored by Junio C Hamano's avatar Junio C Hamano

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
parents 8ac5444c 127b48f9
......@@ -1820,9 +1820,11 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
prefix, &oid, &oc);
}
int get_oid_with_context(struct repository *repo, const char *str,
unsigned flags, struct object_id *oid,
struct object_context *oc)
enum get_oid_result get_oid_with_context(struct repository *repo,
const char *str,
unsigned flags,
struct object_id *oid,
struct object_context *oc)
{
if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
BUG("incompatible flags for get_sha1_with_context");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment