diff options
author | Ammar Askar <ammar_askar@hotmail.com> | 2018-01-27 15:53:56 -0500 |
---|---|---|
committer | Berker Peksag <berker.peksag@gmail.com> | 2018-01-27 23:53:56 +0300 |
commit | b2ec3615c81ca4f3c938245842a45956da8d5acb (patch) | |
tree | 5ba9bd10baa43d0da4057679e2fd99dc88269cab /Lib/test/test_dataclasses.py | |
parent | b1a6ac4c4026d648b3d948945b734a4d0f175a3c (diff) | |
download | cpython-git-b2ec3615c81ca4f3c938245842a45956da8d5acb.tar.gz |
Fix changed file detection on Travis (GH-3129)
Travis when merging changes from a pull request onto the target branch
does not perform a rebase, instead it does a simple merge which causes
the PR commits to retain their commit dates. This means that the commit
log can potentially look like:
PR merge <-- HEAD
normal master commit <- master
more commits from normal workflow
PR commit 1
another master commit
PR commit 2
Performing a git diff from PR commit 2 to master will accidentally
include files that should not be there.
Closes python/core-workflow#14
Diffstat (limited to 'Lib/test/test_dataclasses.py')
0 files changed, 0 insertions, 0 deletions