* [U-Boot] [PATCH v4] gitattributes: dont treat non-text files as text
@ 2019-11-08 15:32 Veeraiyan Chidambaram
2019-11-12 2:06 ` Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Veeraiyan Chidambaram @ 2019-11-08 15:32 UTC (permalink / raw)
To: u-boot
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
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH v4] gitattributes: dont treat non-text files as text
2019-11-08 15:32 [U-Boot] [PATCH v4] gitattributes: dont treat non-text files as text Veeraiyan Chidambaram
@ 2019-11-12 2:06 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2019-11-12 2:06 UTC (permalink / raw)
To: u-boot
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!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191111/bf195ae1/attachment.sig>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-12 2:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-08 15:32 [U-Boot] [PATCH v4] gitattributes: dont treat non-text files as text Veeraiyan Chidambaram
2019-11-12 2:06 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.