git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 5/7] convert_to_git(): safe_crlf/checksafe becomes int conv_flags

From
Lars Schneider <larsxschneider@gmail.com>
Date
Jan 8, 2018, 22:47 UTC
Message-ID
<FFFF054A-6049-49A6-9B31-3E2D6585B21A@gmail.com>
In-Reply-To
<xmqq4lnw82hi.fsf@gitster.mtv.corp.google.com>
Show 24 quoted lines
> 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

Previous: Junio C HamanoNext: Junio C Hamano
Message 8 of 15 in “convert: add support for different encodings”
  1. 0/7 convert: add support for different encodingslars.schneider@autodesk.com, Jan 6, 2018
  2. 1/7 strbuf: remove unnecessary NUL assignment in xstrdup_tolower()lars.schneider@autodesk.com, Jan 6, 2018
  3. 3/7 utf8: add function to detect prohibited UTF-16/32 BOMlars.schneider@autodesk.com, Jan 6, 2018
  4. 2/7 strbuf: add xstrdup_toupper()lars.schneider@autodesk.com, Jan 6, 2018
  5. 4/7 utf8: add function to detect a missing UTF-16/32 BOMlars.schneider@autodesk.com, Jan 6, 2018
  6. 5/7 convert_to_git(): safe_crlf/checksafe becomes int conv_flagslars.schneider@autodesk.com, Jan 6, 2018
  7. Junio C HamanoJan 8, 2018
  8. Lars SchneiderJan 8, 2018
  9. Junio C HamanoJan 8, 2018
  10. Torsten BögershausenJan 9, 2018
  11. 6/7 convert: add support for 'checkout-encoding' attributelars.schneider@autodesk.com, Jan 6, 2018
  12. 7/7 convert: add tracing for checkout-encodinglars.schneider@autodesk.com, Jan 6, 2018
  13. Torsten BögershausenJan 7, 2018
  14. Lars SchneiderJan 8, 2018
  15. Torsten BögershausenJan 8, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.