[U-Boot] [PATCH] gitattributes: dont treat non-text files as text

Wolfgang Denk wd at denx.de
Fri Nov 8 08:24:36 UTC 2019


Dear Veeraiyan,

In message <1573124183-23508-1-git-send-email-external.veeraiyan.c at de.adit-jv.com> you wrote:
> 
> With recent update in u-boot gitattributes all files are treated as regular
> text files. This creates problems with special files and repo always
> shows uncommited files like below.
...

Thanks, but...

> diff --git a/.gitattributes b/.gitattributes
> index 8560b794c0a7..6a0c6a4801d2 100644
> --- a/.gitattributes
> +++ b/.gitattributes
> @@ -1,2 +1,5 @@
>  # Declare files that always have LF line endings on checkout
>  * text eol=lf
> +*.bmp binary
> +*.ttf binary
> +tools/img2brec.sh binary
^^^^^^^^^^^^^^^^^^^^^^^^^^^

This last line is obviously wrong.  It is a plain shell script,
i. e. a normal text file, and it is also recognized as such:

-> file tools/img2brec.sh
tools/img2brec.sh: POSIX shell script, ASCII text executable, with CRLF, CR, LF line terminators


If git misunderstands this, then probably because of the CR / CRLF /
LF mess in this file.  This should be fixed, then you can omit this
incorrectline.

Patch just sent.



Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Premature optimization is the root of all evil.         -- D.E. Knuth


More information about the U-Boot mailing list