[git-users] git showing modified files right after branch chekout
Hi! I have pretty much strange situation. Working on Windows machine and committing to Git Stash. In my global config I have core.autocrlf=true and there is .gitattributesin repo with * text = auto Now here is what I do on clean, recently cloned repo: >git status #1on develop, no changes >git checkout -t origin/BRANCH-1 && git status #2 Branch BRANCH-1 set up to track remote branch GPIII-96 from origin. Switched to a new branch 'BRANCH-1' modified: A.java modified: B.java modified: C.java >file A.java A.java: ASCII text, with CRLF line terminators >git rm --cached -r . && git reset --hard && git status # On branch BRANCH-1 nothing to commit (working directory clean) **WTF??** >git checkout develop -f && git status modified: D.java **WTF???* **#remember on #1 it was OK* >git checkout BRANCH-1 -f && git status modified: A.java modified: B.java modified: C.java **WTF???** I am really not sure if it is connected to line-endings. I just have no idea how to check it. Any ideas on what's going on and how to fix that? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] git showing modified files right after branch chekout
I am using git on Cygwin. Today I figured out that this is .gitattributes file which is messing the stuff. .gitattributes contains only * text = auto After removing the file - problem was gone. But I still wonder why? Because the both git-scm book and github tutorial on lineendings told that .gitattributes should solve my problem. On Thursday, April 3, 2014 10:41:38 PM UTC+4, Nelson Efrain A. Cruz wrote: > > Perhaps it's a problem with git for Windows. I run in a, somehow, similar > situation using git for windows: in a branch, say branch-one, I have files > that didn't exists in branch-two. So changing from branch-one to branch-two > will result in all of these files that didn't exists in branch-two showing > up like untracked files. > > Maybe you can try asking in the group for msysGit[1] > > [1] = https://groups.google.com/forum/#!forum/msysgit > > El abr 2, 2014 8:40 AM, "Stas Fedotov" > > escribió: > >> Hi! >> >> I have pretty much strange situation. Working on Windows machine and >> committing to Git Stash. >> >> In my global config I have core.autocrlf=true and there is .gitattributesin >> repo with * >> text = auto >> >> Now here is what I do on clean, recently cloned repo: >> >> >git status #1on develop, no changes >> >> >git checkout -t origin/BRANCH-1 && git status #2 >> Branch BRANCH-1 set up to track remote branch GPIII-96 from origin. >> Switched to a new branch 'BRANCH-1' >> modified: A.java >> modified: B.java >> modified: C.java >> >> >file A.java >> A.java: ASCII text, with CRLF line terminators >> >> >git rm --cached -r . && git reset --hard && git status >> # On branch BRANCH-1 >> nothing to commit (working directory clean) >> **WTF??** >> >> >git checkout develop -f && git status >> modified: D.java >> **WTF???* **#remember on #1 it was OK* >> >> >git checkout BRANCH-1 -f && git status >> modified: A.java >> modified: B.java >> modified: C.java >> **WTF???** >> >> >> I am really not sure if it is connected to line-endings. I just have no >> idea how to check it. >> >> Any ideas on what's going on and how to fix that? >> >> -- >> You received this message because you are subscribed to the Google Groups >> "Git for human beings" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to git-users+...@googlegroups.com . >> For more options, visit https://groups.google.com/d/optout. >> > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] git showing modified files right after branch chekout
Thanks Philip, Those files are usually code files (java, as, xml, properties) and doesn't contain any non-ascii symbols. Running file command gives usually this: >file A.java A.java: ASCII text, with CRLF line terminators How else can I check that? On Thursday, April 3, 2014 11:18:35 PM UTC+4, Philip Oakley wrote: > > > Sorry for top post. > The problem *maybe* 'unicode' in that autodetect on general unicode text > (i.e. non US ASCII chars) will be detected as binary files rather than as > text files, and somehow thus different (or treated different). In > particular I believe it's that Git detects null bytes as an indicator of > binaryness. > > Can you check if those files have that characteristic? > > Philip > > - Original Message - > *From:* Stas Fedotov > *To:* git-...@googlegroups.com > *Sent:* Thursday, April 03, 2014 7:49 PM > *Subject:* Re: [git-users] git showing modified files right after branch > chekout > > I am using git on Cygwin. > > Today I figured out that this is .gitattributes file which is messing the > stuff. .gitattributes contains only > * text = auto > > After removing the file - problem was gone. > > But I still wonder why? Because the both git-scm book and github tutorial > on lineendings told that .gitattributes should solve my problem. > > > > On Thursday, April 3, 2014 10:41:38 PM UTC+4, Nelson Efrain A. Cruz wrote: >> >> Perhaps it's a problem with git for Windows. I run in a, somehow, similar >> situation using git for windows: in a branch, say branch-one, I have files >> that didn't exists in branch-two. So changing from branch-one to branch-two >> will result in all of these files that didn't exists in branch-two showing >> up like untracked files. >> >> Maybe you can try asking in the group for msysGit[1] >> >> [1] = https://groups.google.com/forum/#!forum/msysgit >> >> El abr 2, 2014 8:40 AM, "Stas Fedotov" escribió: >> >>> Hi! >>> >>> I have pretty much strange situation. Working on Windows machine and >>> committing to Git Stash. >>> >>> In my global config I have core.autocrlf=true and there is >>> .gitattributes in repo with * text = auto >>> >>> Now here is what I do on clean, recently cloned repo: >>> >>> >git status #1on develop, no changes >>> >>> >git checkout -t origin/BRANCH-1 && git status #2 >>> Branch BRANCH-1 set up to track remote branch GPIII-96 from origin. >>> Switched to a new branch 'BRANCH-1' >>> modified: A.java >>> modified: B.java >>> modified: C.java >>> >>> >file A.java >>> A.java: ASCII text, with CRLF line terminators >>> >>> >git rm --cached -r . && git reset --hard && git status >>> # On branch BRANCH-1 >>> nothing to commit (working directory clean) >>> **WTF??** >>> >>> >git checkout develop -f && git status >>> modified: D.java >>> **WTF???* **#remember on #1 it was OK* >>> >>> >git checkout BRANCH-1 -f && git status >>> modified: A.java >>> modified: B.java >>> modified: C.java >>> **WTF???** >>> >>> >>> I am really not sure if it is connected to line-endings. I just have no >>> idea how to check it. >>> >>> Any ideas on what's going on and how to fix that? >>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "Git for human beings" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to git-users+...@googlegroups.com. >>> For more options, visit https://groups.google.com/d/optout. >>> >> -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+...@googlegroups.com . > For more options, visit https://groups.google.com/d/optout. > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
