diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-13 18:18:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-13 18:18:41 -0800 |
| commit | c73472a8deb9dc194d05747dda3061c6324750e4 (patch) | |
| tree | 09d7657d5d28cbb85e41c9684c398af60a103f4f | |
| parent | Merge branch 'rj/sequencer-sign-off-header-static' (diff) | |
| parent | get_oid_with_context(): match prototype and implementation (diff) | |
| download | tgif-c73472a8deb9dc194d05747dda3061c6324750e4.tar.xz | |
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
| -rw-r--r-- | sha1-name.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sha1-name.c b/sha1-name.c index d1cc77c124..6dda2c16df 100644 --- a/sha1-name.c +++ b/sha1-name.c @@ -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"); |