Discrepancy between github.com and GHfVS PR diffs

[jcansdale]

• GitHub Extension for Visual Studio version: 2.2.1.100
• Visual Studio version: 2015

I checked out a PR and noticed that some PR files seemed have no changes:

On github.com the same file does appear to have changes:

[jcansdale]

It looks like the author of nunit/nunit#2221 also noticed the anomaly (on https://github.com).

Everything is appearing here in the diff even though some of it is already in master. Not sure why that is.

It's a small World, @rprouse! 😄 I'll put out some feelers and see if I can find out what's going on. Have you seen this happen before? Any ideas what might have caused it?

[jcansdale]

There does indeed seem to be a discrepancy between
https://github.com/github/VisualStudio/issues/1007.diff
and doing a git diff master..release-371-merge locally.

Here are the two diffs for comparison: github.diff.txt (github.com), git.diff.txt (local)

[rprouse]

@jcansdale when I do the git diff master..release-371-merge locally, I see what I expect to be merged back into master.

I have seen this before, often when working on hotfixes in a release branch. In this case, the extra changes in the GitHub diff are commits that I cherry picked into the release branch for a hotfix that are already merged into master. Since those commits are already in both branches, I don't expect to see them.

You reported this in the VisualStudio repo, but I think VisualStudio is correct and the diff on GitHub is the incorrect one.

[jcansdale]

@rprouse it seems you need to do a git diff master...release-371-merge (with the extra .) to see what appears on https://github.com. Basically if master moves on, those extra commits shouldn't appear in the diff (they're not part of that PR). I finally understand what ... means. 😉

I've tweaked our code to use the merge base (rather than simply the base of the PR) and now it seems to work. 😄

I've been using NUnit as a decent sized solution for testing inline comment support. Here's a teaser:

[jcansdale]

Fixed in #1008