Wrong commit diff in file history

[dvdveer]

When you view the commit changes of a file in e.g. file history or repository history, sometimes the diff is wrong. I noticed this problem in particular when a file was changed in multiple branches. In that case the shown diff is not from the individual commit, but somehow shows changes from other commits as well.

This appears to be the same issue as #584 (which was fixed some time ago), you can even use the repository that was created for the isssue to reproduce it: https://github.com/turijs/gitlens-issue-584

I can reproduce this issue in the current Gitlens version (9.9.1) going back to 9.7.0. In gitlens version 9.6.3 it works normally however.

• GitLens Version: 9.9.1
• VSCode Version: 1.36.1
• OS Version: macOS Mojave (also seen on Windows 10)

Steps to Reproduce:

1. Clone repository https://github.com/turijs/gitlens-issue-584 and open in vscode with gitlens
2. Open the only file in the repo and go to the GitLens File History pane
3. Click on commit 3, and note that the diff shows changes to "Line 1" and "Line 3", when only "Line 3" was actually changed in that commit.

Gitlens 9.9.1 (wrong):

Gitlens 9.6.3 (OK):

[github-actions]

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.