Revision 6523728499e77afaed0008875b19b308682c3f88 authored by Torsten Bögershausen on 28 June 2016, 08:01:13 UTC, committed by Junio C Hamano on 06 July 2016, 18:53:51 UTC
Before this change,
$ echo "* text=auto" >.gitattributes
$ echo "* eol=crlf" >>.gitattributes

would have the same effect as
$ echo "* text" >.gitattributes
$ git config core.eol crlf

Since the 'eol' attribute had higher priority than 'text=auto', this may
corrupt binary files and is not what most users expect to happen.

Make the 'eol' attribute to obey 'text=auto' and now
$ echo "* text=auto" >.gitattributes
$ echo "* eol=crlf" >>.gitattributes
behaves the same as
$ echo "* text=auto" >.gitattributes
$ git config core.eol crlf

In other words,
$ echo "* text=auto eol=crlf" >.gitattributes
has the same effect as
$ git config core.autocrlf true

and
$ echo "* text=auto eol=lf" >.gitattributes
has the same effect as
$ git config core.autocrlf input

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent caa47ad
Raw File
version.h
#ifndef VERSION_H
#define VERSION_H

extern const char git_version_string[];

const char *git_user_agent(void);
const char *git_user_agent_sanitized(void);

#endif /* VERSION_H */
back to top