> On 08 Jan 2018, at 22:28, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
> lars.schneider@xxxxxxxxxxxx writes:
>
>> 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).
Nice catch. I'll fix that in the next iteration.
Is it OK if I send the next iteration soon or would you prefer
it if I wait until after 2.16 release?
Plus, is it ok to keep the base of the series or would you prefer
it if I rebase it to the latest master (because of a minor conflict)?
Thanks,
Lars
