From: Lars Schneider <larsxschneider@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: lars.schneider@autodesk.com, git@vger.kernel.org, tboegi@web.de,
j6t@kdbg.org, sunshine@sunshineco.com, peff@peff.net,
ramsay@ramsayjones.plus.com, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH v3 5/7] convert_to_git(): safe_crlf/checksafe becomes int conv_flags
Date: Mon, 8 Jan 2018 23:47:20 +0100 [thread overview]
Message-ID: <FFFF054A-6049-49A6-9B31-3E2D6585B21A@gmail.com> (raw)
In-Reply-To: <xmqq4lnw82hi.fsf@gitster.mtv.corp.google.com>
> On 08 Jan 2018, at 22:28, Junio C Hamano <gitster@pobox.com> wrote:
>
> lars.schneider@autodesk.com 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
next prev parent reply other threads:[~2018-01-08 22:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-06 0:48 [PATCH v3 0/7] convert: add support for different encodings lars.schneider
2018-01-06 0:48 ` [PATCH v3 1/7] strbuf: remove unnecessary NUL assignment in xstrdup_tolower() lars.schneider
2018-01-06 0:48 ` [PATCH v3 2/7] strbuf: add xstrdup_toupper() lars.schneider
2018-01-06 0:48 ` [PATCH v3 3/7] utf8: add function to detect prohibited UTF-16/32 BOM lars.schneider
2018-01-06 0:48 ` [PATCH v3 4/7] utf8: add function to detect a missing " lars.schneider
2018-01-06 0:48 ` [PATCH v3 5/7] convert_to_git(): safe_crlf/checksafe becomes int conv_flags lars.schneider
2018-01-08 21:28 ` Junio C Hamano
2018-01-08 22:47 ` Lars Schneider [this message]
2018-01-08 23:17 ` Junio C Hamano
2018-01-09 6:20 ` Torsten Bögershausen
2018-01-06 0:48 ` [PATCH v3 6/7] convert: add support for 'checkout-encoding' attribute lars.schneider
2018-01-06 0:48 ` [PATCH v3 7/7] convert: add tracing for checkout-encoding lars.schneider
2018-01-07 9:38 ` [PATCH v3 0/7] convert: add support for different encodings Torsten Bögershausen
2018-01-08 14:38 ` Lars Schneider
2018-01-08 18:08 ` Torsten Bögershausen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=FFFF054A-6049-49A6-9B31-3E2D6585B21A@gmail.com \
--to=larsxschneider@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=lars.schneider@autodesk.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sunshine@sunshineco.com \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).