Sourcetree表示未执行的更改，但命令行未执行

Question

Problem

I have come across an annoying problem where my Sourcetree always thinks I have 4 outgoing changes but the command line does not.

Attempts

I am not able to reset, force a clean, force a checkout, change to a clean new branch or anything of the sort to remove these files. Once these files show up they are always present regardless of branch. If I change, add or remove a different file they show up correctly in both Sourcetree and git.

I have seen this thread that is very similar but a big difference is their outgoing doesn't even show any changes.

Visual

Additional Information

• Windows 7
• Sourcetree 2.3.1.0
• git 2.13.2 (see the same issue with embedded vs system git)

Suggestions

Short of deleting the whole repository folder which may or may not work, can anyone think of another way to remove these?

Thank you,

Answer 1

Solution

 git config core.fileMode false

Explanation

This appears to be an issue related to the core.fileMode setting. I started experiencing the reverse of this question additionally (where my Cygwin terminal started to show unstaged changes as well), and git diff on one of the files stated:

old mode 100644
new mode 100755

The solution to this was to turn that config off which seemed to fix both issues.