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

From: Vignesh Rajendran vignesh.rajendran@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 uncommitted files like below.
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/logos/compulab.bmp modified: tools/logos/denx-comp.bmp modified: tools/logos/toradex.bmp
To fix above problem special files bmp/ttf files are treated as binary files in the gitattributes.
Signed-off-by: Vignesh Rajendran vignesh.rajendran@in.bosch.com Signed-off-by: Veeraiyan Chidambaram veeraiyan.chidambaram@in.bosch.com --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/.gitattributes b/.gitattributes index 8560b794c0a7..899473ab0fbb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,5 @@ # Declare files that always have LF line endings on checkout * text eol=lf +# Denote all files that are truly binary and should not be modified +*.bmp binary +*.ttf binary

On Fri, Nov 08, 2019 at 04:32:55PM +0100, Veeraiyan Chidambaram wrote:
From: Vignesh Rajendran vignesh.rajendran@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 uncommitted files like below.
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/logos/compulab.bmp modified: tools/logos/denx-comp.bmp modified: tools/logos/toradex.bmp
To fix above problem special files bmp/ttf files are treated as binary files in the gitattributes.
Signed-off-by: Vignesh Rajendran vignesh.rajendran@in.bosch.com Signed-off-by: Veeraiyan Chidambaram veeraiyan.chidambaram@in.bosch.com
Applied to u-boot/master, thanks!
participants (2)
-
Tom Rini
-
Veeraiyan Chidambaram