fc5825a8f9
Jenkins does its own `git merge` when testing PRs. Doing a naive
`git diff ${merge_commit}^..${merge_commit}` won't work right because
it might perform a diff across multiple commits.
What we want to do here is to just skip trivial merge commits or
otherwise error out on them if they're non-trivial (since it likely
means that one did conflict resolution manually instead of rebasing,
which we should encourage).
The `origin/master..$HEAD` range will correctly still contain all the
parents of any merge commit which is not yet in `origin/master`.
|
||
|---|---|---|
| .. | ||
| prow | ||
| build-check.sh | ||
| build.sh | ||
| ci-commitmessage-submodules.sh | ||
| codestyle.sh | ||
| cosa-build.sh | ||
| installdeps.sh | ||
| libbuild.sh | ||
| msrv.sh | ||
| vmcheck-provision.sh | ||