Re: Git v2.21.0-rc0 broken on *BSD, maybe others
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 12, 2019, 18:41 UTC
- Message-ID
- <xmqqva1odf41.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <xmqqlg2ldjg4.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
> If I find time later in the day, I may forge your sign-off and > fabricate log messages for both patches, but unfortunately I need to > run a long errand today during the day, so it may not happen.
Here is what I have, with forged sign-off. I am not merging them to 'next' yet, but will be pushing them on 'pu' shortly to give them better exposure.
-- >8 -- From: Duy Nguyen <pclouds@gmail.com> Date: Tue, 12 Feb 2019 19:43:23 +0700 Subject: [PATCH] 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 d1dd94b308 (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 <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- sha1-name.c | 8 +++++--- 1 file 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");
-- 2.21.0-rc0-36-ge9bd4aa026