Description

git diff origin/master will include all the diffs from all PRs merged into the remote master since your PR was forked off of master. https://stackoverflow.com/a/65166745 explains that we should be using three dots instead of two dots (which is what git diff origin/master is doing under the hood), and when we do that, I don't think it makes a difference whether we use local master or origin/master, so I just picked local master for no particular reason.

Related issue

b/254325901

How has this been tested?

I noticed that git diff origin/master was giving me polluted diffs. I messed around with git commands on my workstation to confirm that the new command is doing what I think it is doing. I also checked two things in the context of Kokoro:

1. I checked that the diffs look right for this PR (just third_party_apps_test.go)
2. I waited for a different PR to be merged into master, then reran tests without merging from master and checked that the diffs are again just third_party_apps_test.go and didn't include any diffs introduced by master moving ahead.

Checklist:

• Unit tests
  • Unit tests do not apply.
  • Unit tests have been added/modified and passed for this PR.
• Integration tests
  • Integration tests do not apply.
  • Integration tests have been added/modified and passed for this PR.
• Documentation
  • This PR introduces no user visible changes.
  • This PR introduces user visible changes and the corresponding documentation change has been made.
• Minor version bump
  • This PR introduces no new features.
  • This PR introduces new features, and there is a separate PR to bump the minor version since the last release already.
  • This PR bumps the version.