Am 28.06.19 um 11:42 schrieb Vladimir Sitnikov: > Felix, > > I see you've added a note on "core.autocrlf". > However that note is misleading and it is just wrong. > > Would you please revert it?
Could you try to commit a version that suits you, as I believe we should have something about the line endings vs git and that setting helped me. But of course I will have a look at this (not today, though, as I have not enough time for it) later. Felix > > The key point of .gitattributes file is to ensure the committed text files > are properly recognized NOMATTER what the client settings are. > > Here you go (basically I unset core.autocrlf and show that git shows no > "changes"). > > I do use core.autocrlf=input (macOS recommendation) for the projects that > do not have proper .gitattribute files, however it has nothing to do with > JMeter. > > $ uname -a > Darwin ...local 18.6.0 Darwin Kernel Version 18.6.0: Thu Apr 25 23:16:27 > PDT 2019; root:xnu-4903.261.4~2/RELEASE_X86_64 x86_64 > > $ git config --global core.autocrlf > input > $ git config --global --unset core.autocrlf > $ git config --global core.autocrlf > # empty > > $ git clone https://github.com/apache/jmeter && cd jmeter > > $ LC_ALL=C git status > On branch master > Your branch is up to date with 'origin/master'. > > nothing to commit, working tree clean > > $ LC_ALL=C git checkout -b v23 v2_3 > Switched to a new branch 'v23' > $ LC_ALL=C git status > On branch v23 > nothing to commit, working tree clean > > $ LC_ALL=C git checkout master > Switched to branch 'master' > Your branch is up to date with 'origin/master'. > > $ LC_ALL=C git diff > # no results > $ LC_ALL=C git status > On branch master > Your branch is up to date with 'origin/master'. > > nothing to commit, working tree clean > > Vladimir >
