Re: [PATCH v3 5/7] convert_to_git(): safe_crlf/checksafe becomes int conv_flags
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 8, 2018, 21:28 UTC
- Message-ID
- <xmqq4lnw82hi.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20180106004808.77513-6-lars.schneider@autodesk.com>
lars.schneider@autodesk.com writes:
Show 17 quoted lines
> diff --git a/sha1_file.c b/sha1_file.c
> index afe4b90f6e..dcb02e9ffd 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -75,14 +75,14 @@ static struct cached_object *find_cached_object(const unsigned char *sha1)
> }
>
>
> -static enum safe_crlf get_safe_crlf(unsigned flags)
> +static int get_conv_flags(unsigned flags)
> {
> if (flags & HASH_RENORMALIZE)
> - return SAFE_CRLF_RENORMALIZE;
> + return CONV_EOL_RENORMALIZE;
> else if (flags & HASH_WRITE_OBJECT)
> - return safe_crlf;
> + return global_conv_flags_eol | CONV_WRITE_OBJECT;This macro has not yet introduced at this point (it appears in 6/7 if I am not mistaken).