From 48a37afdc262708578374aea9ef55d091dfb4fd6 Mon Sep 17 00:00:00 2001 From: David Alger Date: Sun, 23 Jun 2019 17:17:47 -0500 Subject: [PATCH] Stop git handling binary images files as text When cloning the repository from scratch, 4 files are coming up as modified and attempting to run `checkout` to get to a clean state fails due to the rule in this file setting all files (`*`) to be processed by Git as `text` with automatic EOL processing. See the below for what happens: ``` davidalger:05:13 PM:/server/proj$ git clone https://github.com/stefanprodan/dockprom Cloning into 'dockprom'... remote: Enumerating objects: 605, done. remote: Total 605 (delta 0), reused 0 (delta 0), pack-reused 605 Receiving objects: 100% (605/605), 1.49 MiB | 328.00 KiB/s, done. Resolving deltas: 100% (343/343), done. davidalger:05:14 PM:/server/proj$ cd dockprom/ warning: CRLF will be replaced by LF in screens/Grafana_Docker_Containers.png. The file will have its original line endings in your working directory davidalger:05:14 PM:/server/proj/dockprom (master *) $ git status On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: screens/Grafana_Docker_Containers.png modified: screens/Grafana_Docker_Host.png modified: screens/Grafana_Prometheus.png modified: screens/Slack_Notifications.png no changes added to commit (use "git add" and/or "git commit -a") warning: CRLF will be replaced by LF in screens/Grafana_Docker_Containers.png. The file will have its original line endings in your working directory davidalger:05:14 PM:/server/proj/dockprom (master *) $ git checkout . Updated 4 paths from the index warning: CRLF will be replaced by LF in screens/Grafana_Docker_Containers.png. The file will have its original line endings in your working directory davidalger:05:14 PM:/server/proj/dockprom (master *) $ git status On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: screens/Grafana_Docker_Containers.png modified: screens/Grafana_Docker_Host.png modified: screens/Grafana_Prometheus.png modified: screens/Slack_Notifications.png no changes added to commit (use "git add" and/or "git commit -a") warning: CRLF will be replaced by LF in screens/Grafana_Docker_Containers.png. The file will have its original line endings in your working directory davidalger:05:14 PM:/server/proj/dockprom (master *) $ vi .gitattributes davidalger:05:14 PM:/server/proj/dockprom (master *) $ git checkout screens/ Updated 4 paths from the index davidalger:05:14 PM:/server/proj/dockprom (master *) $ git status On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: .gitattributes no changes added to commit (use "git add" and/or "git commit -a") davidalger:05:14 PM:/server/proj/dockprom (master *) $ ``` --- .gitattributes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index b72c2c6..8b00408 100644 --- a/.gitattributes +++ b/.gitattributes @@ -40,9 +40,9 @@ # # image files are treated as binary by default. ############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary +*.jpg binary +*.png binary +*.gif binary ############################################################################### # diff behavior for common document formats