git - 切换到本地开发，然后返回功能分支重置修改/添加文件的状态

Question

I added some changes in my feature branch, staged, committed and pushed it to origin using push -u git command.

Next day, I updated my local develop and feature branches to get latest code from remote using standard git fetch / git merge procedures.

At this point, I am seeing some interesting things:

I am on my feature branch, git status tells me all is clean, this is correct

I switch to develop branch, git status shows all is clean, this is correct

I switch back to my feature branch, git status reports all my changes that I already pushed to remote day before as follows:

1. STAGED (GREEN) - My changed are being removed (which marks some files as being ready to commit). The existing files are marked as modified and my changes are removed from them. The files I added are marked as deleted,
2. NOT STAGED (PURPLE) - The existing project files I modified as part of my push,
3. UNTRACKED (RED) - The new files I added to the project as part of my push above.

I dont understand why is this happening but it should not.

If I issue git add . , no message shows in git, I am just back to the terminal command.

If I issue now git status , it now shows that my feature branch is uptodate "nothing to commit, working tree is clean".

Switching back and forth from feature to develop and develop to feature branches like described above on my Mac reproduces same problem over and over. Doing so on my Windows machine is not reproducing this issue at all.

So, my conclusion is that something is wrong with my git environment on my Mac machine .

But then, I also tried getting a brand new clone of my project on my Mac (which now contains my feature branch since I pushed it with all my changes using git push -u command), then tried switching back and forth on that clone between develop and my feature branch and the issue was NOT happening. That made it even more confusing.

It looks like something is not being updated properly with my git on my Mac machine. What could it be and how to investigate this?

We are crossplatform team working on both Mac and Windows. My core.autocrlf is set to input on my Mac and to true on my Windows. I dont know other team members settings for core.autocrlf .

Answer 1

First, make sure git config core.autocrlf is always set to false (on Windows or Mac).
Any EOL conversion you might need should be done in a .gitattributes eol attribute .

Then check your git config -l in your repo on the two platform: a content filter driver could be an example of automatic modification on commit, which might not be declared on the other platform.