Re: Gitattributes file is not respected when switching between branches
- From
Torsten Bögershausen <tboegi@web.de>
- Date
- Sep 12, 2016, 19:42 UTC
- Message-ID
- <7c14756e-29f9-b475-f5f5-597acb8cea98@web.de>
- In-Reply-To
- <8df2883f-ec3c-3446-2e06-207c93452332@web.de>
On 12.09.16 21:35, Torsten Bögershausen wrote:
Show 36 quoted lines
> On 12.09.16 14:55, Виталий Ищенко wrote: >> Good day >> >> I faced following issue with gitattributes file (at least eol setting) >> when was trying to force `lf` mode on windows. >> >> We have 2 branches: master & dev. With master set as HEAD in repository >> >> I've added `.gitattributes` with following content to `dev` branch >> >> ``` >> * text eol=lf >> ``` >> >> Now when you clone this repo on other machine and checkout dev branch, >> eol setting is not respected. >> As a workaround you can rm all files except .git folder and do hard reset. >> >> Issue is reproducible on windows & unix versions. Test repo can be >> found on github >> https://github.com/betalb/gitattributes-issue >> >> master branch - one file without gitattributes >> feature-branch - .gitattributes added with eol=lf >> unix-feature-branch - .gitattributes added with eol=crlf >> >> Thanks, >> Vitalii > Some more information may be needed, to help to debug. > > Which version of Git are you using ? > What does > > git ls-files --eol > > say ?
Obs, All information was in the email.
tb@xxx:/tmp/gitattributes-issue> git ls-files --eol i/lf w/lf attr/ testfile-crlf.txt tb@xxx:/tmp/gitattributes-issue> ls -al total 8 drwxr-xr-x 4 tb wheel 136 Sep 12 21:38 . drwxrwxrwt 19 root wheel 646 Sep 12 21:38 .. drwxr-xr-x 13 tb wheel 442 Sep 12 21:38 .git -rw-r--r-- 1 tb wheel 60 Sep 12 21:38 testfile-crlf.txt tb@xxx:/tmp/gitattributes-issue>
Could it be that you didn't commit the file ".gitattributes" ? This could help: git add .gitattributes && git commit -m "Add .gitattributes"