On Fri, Feb 21, 2014 at 5:32 PM, Michael Haggerty <mhag...@alum.mit.edu> wrote:
> Signed-off-by: Michael Haggerty <mhag...@alum.mit.edu>
> ---
> cache.h | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/cache.h b/cache.h
> index dc040fb..0ecd1c8 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -788,13 +788,29 @@ static inline void *read_sha1_file(const unsigned char
> *sha1, enum object_type *
> {
> return read_sha1_file_extended(sha1, type, size,
> LOOKUP_REPLACE_OBJECT);
> }
> +
> +/*
> + * If a replacement for object sha1 has been set up, return the
> + * replacement object's name (replaced recursively, if necessary).
> + * The return value is either sha1 or a pointer to a
> + * permanently-allocated value. This function always respects replace
> + * references, regardless of the value of check_replace_refs.
Here you talk about "check_replace_refs" ...
> + */
> extern const unsigned char *do_lookup_replace_object(const unsigned char
> *sha1);
> +
> +/*
> + * If object sha1 should be replaced, return the replacement object's
> + * name. This function is similar to do_lookup_replace_object(),
> + * except that it when object replacement is suppressed, it always
> + * returns its argument unchanged.
> + */
> static inline const unsigned char *lookup_replace_object(const unsigned char
> *sha1)
> {
> if (!read_replace_refs)
... but here "read_replace_refs" is used.
> return sha1;
> return do_lookup_replace_object(sha1);
> }
Thanks,
Christian.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
