undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* nd/get-oid-with-context-returns-an-enum:
  get_oid_with_context(): match prototype and implementation
This commit is contained in:
Junio C Hamano 2019-02-13 18:18:41 -08:00
commit c73472a8de
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sha1-name.c
View File

@ -1820,9 +1820,11 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
prefix, &oid, &oc); prefix, &oid, &oc);
} }
int get_oid_with_context(struct repository *repo, const char *str, enum get_oid_result get_oid_with_context(struct repository *repo,
unsigned flags, struct object_id *oid, const char *str,
struct object_context *oc) unsigned flags,
struct object_id *oid,
struct object_context *oc)
{ {
if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE) if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
BUG("incompatible flags for get_sha1_with_context"); BUG("incompatible flags for get_sha1_with_context");