nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

file showing in modified filter but diff window says unmodified

Phil Bergner

I downloaded a github repo, created a project in eclipse, pushed the project contents to a server via a metadata API, did some work etc. Its possible that the metadata API process might have modified my files in some way because now in Sourcetree I'm seeing all of my repo files in the 'Show Modified' filter list. When I click on any of them that I didn't manually change the diff window says 'unmodified file'. Any idea what would cause this or how to filter these out?

Accepted answers

Aseem Parikh_nrfvsl

Permission changes and whitespace changes (newlines in particular) count as modifications, but diffing will show no difference for either of these situations.

Take a look at this documentation on workarounds for whitespace changes: http://git-scm.com/book/ch7-1.html#Formatting-and-Whitespace

All comments

Aseem Parikh_nrfvsl

Permission changes and whitespace changes (newlines in particular) count as modifications, but diffing will show no difference for either of these situations.

Take a look at this documentation on workarounds for whitespace changes: http://git-scm.com/book/ch7-1.html#Formatting-and-Whitespace

Phil Bergner

Wouldn't whitespace changes show up with the Ignore Whitespace box unchecked?

Aseem Parikh_nrfvsl

Theoretically, yes. I'm still convinced that it's a line ending problem considering the symptoms of the problem. Sourcetree is probably just inherting its behavior from your git config.

Do you see the same thing on the command line if you run 'git status'? If so, what do you see when you run 'git diff <modified_file>'?

What OS are you working on? Are you working with a team that uses other OSes?

Phil Bergner

when i run git status it shows them all as modified

If I do a git diff for a specific file I see : 'warning: LF will be replaced with CRLF ... the file will have its original line endings in your working directory'