From: "Torsten Bögershausen" <tboegi@web.de>
To: "Виталий Ищенко" <betalb@gmail.com>, git@vger.kernel.org
Subject: Re: Gitattributes file is not respected when switching between branches
Date: Mon, 12 Sep 2016 21:42:08 +0200 [thread overview]
Message-ID: <7c14756e-29f9-b475-f5f5-597acb8cea98@web.de> (raw)
In-Reply-To: <8df2883f-ec3c-3446-2e06-207c93452332@web.de>
On 12.09.16 21:35, Torsten Bögershausen wrote:
> 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"
next prev parent reply other threads:[~2016-09-12 19:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-12 12:55 Gitattributes file is not respected when switching between branches Виталий Ищенко
2016-09-12 19:35 ` Torsten Bögershausen
2016-09-12 19:42 ` Torsten Bögershausen [this message]
2016-09-16 6:51 ` Виталий Ищенко
2016-09-18 19:31 ` Torsten Bögershausen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7c14756e-29f9-b475-f5f5-597acb8cea98@web.de \
--to=tboegi@web.de \
--cc=betalb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).