Re: [ANNOUNCE] Git v2.10.0-rc0

From: Torsten Bögershausen <tboegi@web.de>
Date: Aug 17, 2016, 18:27 UTC
Message-ID: <ab7cdb40-03f4-af04-d9c5-5b09e46968a4@web.de>
In-Reply-To: <xmqqtwej9txz.fsf@gitster.mtv.corp.google.com>

On 17.08.16 19:38, Junio C Hamano wrote:

Show 41 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
> 
>> Torsten Bögershausen <tboegi@web.de> writes:
>>
>>> Is this `text=auto` correct ?
>>
>> Thanks for spotting a typo.  Definitely.
>>
>>> I think it should be
>>>
>>>    used to have the same effect as
>>>    $ echo "* text eol=crlf" >.gitattributes
>>
>> Thanks.
>>
>>> # In other words, the `auto` was ignored, as explained here:
>>> +   $ git config core.eol crlf
>>> +   i.e. declaring all files are text; the combination now is
>>> +   equivalent to doing
>>> +   $ git config core.autocrlf true
>>> +
> 
> Just to make sure I got you right, how does this look?
> 
>  Documentation/RelNotes/2.10.0.txt | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt
> index 179e575..ccf5f64 100644
> --- a/Documentation/RelNotes/2.10.0.txt
> +++ b/Documentation/RelNotes/2.10.0.txt
> @@ -235,13 +235,13 @@ Performance, Internal Implementation, Development Support etc.
>   * The API to iterate over all the refs (i.e. for_each_ref(), etc.)
>     has been revamped.
>  
> - * The handling of the "text = auto" attribute has been updated.
> + * The handling of the "text=auto" attribute has been corrected.
>     $ echo "* text=auto eol=crlf" >.gitattributes
>     used to have the same effect as
> -   $ echo "* text=auto eol=crlf" >.gitattributes
> +   $ echo "* text eol=crlf" >.gitattributes

# Now we describe/define the eol at checkouts twice. # I think we can drop this line:

>     $ git config core.eol crlf

# The rest looks good:

Show 8 quoted lines

> -   i.e. declaring all files are text; the combination now is
> -   equivalent to doing
> +   i.e. declaring all files are text (ignoring "auto").  The
> +   combination has been fixed to be equivalent to doing
>     $ git config core.autocrlf true
>  
>   * A few tests that specifically target "git rebase -i" have been
>

# Just to be sure: the whole paragraph may look like this:

* The handling of the "text=auto" attribute has been corrected.
  $ echo "* text=auto eol=crlf" >.gitattributes
  used to have the same effect as
  $ echo "* text eol=crlf" >.gitattributes
  i.e. declaring all files are text (ignoring "auto").  The
  combination has been fixed to be equivalent to doing
  $ git config core.autocrlf true