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

Bin Meng bmeng.cn at gmail.com
Thu Nov 7 12:37:36 UTC 2019


Hi Veeraiyan,

On Thu, Nov 7, 2019 at 6:56 PM Veeraiyan Chidambaram
<external.veeraiyan.c at de.adit-jv.com> wrote:
>
> From: Vignesh Rajendran <vignesh.rajendran at in.bosch.com>
>
> 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.

typo of 'uncommited'

>
> Your branch is up-to-date with 'origin/master'.
> Changes not staged for commit:
>   (use "git add <file>..." to update what will be committed)
>   (use "git checkout -- <file>..." to discard changes in working directory)
>
>         modified:   tools/img2brec.sh
>         modified:   tools/logos/compulab.bmp
>         modified:   tools/logos/denx-comp.bmp
>         modified:   tools/logos/toradex.bmp

My git does not complain though ... Do you know why?

>
> To fix above problem special files bmp/ttf files are treated as binary
> files in the gitattributes.
>
> Signed-off-by: Vignesh Rajendran <vignesh.rajendran at in.bosch.com>
> Signed-off-by: Veeraiyan Chidambaram <veeraiyan.chidambaram at in.bosch.com>
> ---
>  .gitattributes | 3 +++
>  1 file changed, 3 insertions(+)
>
> 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

I doubt this one is binary. It's a shell script file.

> --

Regards,
Bin


More information about the U-Boot mailing list