From: Justin Tobler <jltobler@gmail.com>
Date: Wed, 10 Sep 2025 14:43:20 GMT
Subject: Re: [PATCH] odb: drop deprecated wrapper functions
Message-ID: <fho5ch7r6d54tqxd56s4lcrv3ms6w4mytpbieere3qv3lz34zw@ufb22yd5w6xl>
In-Reply-To: <20250910-b4-pks-odb-drop-wrappers-v1-1-6ed660cb1eec@pks.im>

On 25/09/10 03:12PM, Patrick Steinhardt wrote:
> diff --git a/odb.h b/odb.h
> index 3dfc66d75a..e8b9dff948 100644
> --- a/odb.h
> +++ b/odb.h
> @@ -475,37 +475,4 @@ static inline int odb_write_object(struct object_database *odb,
>  	return odb_write_object_ext(odb, buf, len, type, oid, NULL, 0);
>  }
>  
> -/* Compatibility wrappers, to be removed once Git 2.51 has been released. */
> -#include "repository.h"
> -
> -static inline int oid_object_info_extended(struct repository *r,
> -					   const struct object_id *oid,
> -					   struct object_info *oi,
> -					   unsigned flags)
> -{
> -	return odb_read_object_info_extended(r->objects, oid, oi, flags);
> -}
> -
> -static inline int oid_object_info(struct repository *r,
> -				  const struct object_id *oid,
> -				  unsigned long *sizep)
> -{
> -	return odb_read_object_info(r->objects, oid, sizep);
> -}
> -
> -static inline void *repo_read_object_file(struct repository *r,
> -					  const struct object_id *oid,
> -					  enum object_type *type,
> -					  unsigned long *size)
> -{
> -	return odb_read_object(r->objects, oid, type, size);
> -}
> -
> -static inline int has_object(struct repository *r,
> -			     const struct object_id *oid,
> -			     unsigned flags)
> -{
> -	return odb_has_object(r->objects, oid, flags);
> -}
> -
>  #endif /* ODB_H */

Nice to see this cleanup. This patch looks obviously correct to me.

-Justin