Repositories view changes including changes from older commits in diff

[AnthonyWeston]

Sometimes when I am reviewing changes in the Repositories view under the "X files changed" heading, when I click the changed file to open the diff, it will display current changes as well as changes from older commits. This only happens when I am viewing all the changes for the file or just the staged changes. Opening the unstaged changes correctly shows only unstaged changes. I haven't figured out how to reproduce this consistently.

Right now, I'm working in a repository with a master branch, a development branch that is periodically merged into master, and a local branch for a bugfix that is a few commits ahead of the development branch. The bugfix branch isn't on the remote repository yet, but everything else is. I currently have 12 uncommitted changes, and when I open the changes for one of the files, it includes the diff for a commit from over a year ago. The development and bugfix branches were created recently, so all three branches have the same history up until about a month ago.

This is a private repository so I can't link to the example, and really have no idea how to reproduce the issue intentionally. If anyone has ideas or knows any additional info that I should include, I would greatly appreciate it!