Skip to content

Commit 127b48f

Browse files
pcloudsgitster
authored andcommitted
get_oid_with_context(): match prototype and implementation
The get_oid_with_context() function is declared to return an enum in cache.h, but defined to return an int in sha1-name.c. The compiler notices this on AIX and rejects the build, since d1dd94b (Do not print 'dangling' for cat-file in case of ambiguity - 2019-01-17) was merged. Return the correct type from the implementation to fix this. Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 243a4c7 commit 127b48f

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

sha1-name.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,9 +1820,11 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
18201820
prefix, &oid, &oc);
18211821
}
18221822

1823-
int get_oid_with_context(struct repository *repo, const char *str,
1824-
unsigned flags, struct object_id *oid,
1825-
struct object_context *oc)
1823+
enum get_oid_result get_oid_with_context(struct repository *repo,
1824+
const char *str,
1825+
unsigned flags,
1826+
struct object_id *oid,
1827+
struct object_context *oc)
18261828
{
18271829
if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
18281830
BUG("incompatible flags for get_sha1_with_context");

0 commit comments

Comments
 (0)