diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-01-27 22:48:09 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2018-01-27 22:48:09 (GMT) |
| commit | 4d2dd64471c5047fe4aa24fb407e9d855344388e (patch) | |
| tree | eeb6ba9936b21829f04e196635df626ffb6c2500 /Python/Python-ast.c | |
| parent | d7274c6638fc88d72b73f8cdc6b888270a5e7a50 (diff) | |
| download | cpython-4d2dd64471c5047fe4aa24fb407e9d855344388e.zip cpython-4d2dd64471c5047fe4aa24fb407e9d855344388e.tar.gz cpython-4d2dd64471c5047fe4aa24fb407e9d855344388e.tar.bz2 | |
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
(cherry picked from commit b2ec3615c81ca4f3c938245842a45956da8d5acb)
Diffstat (limited to 'Python/Python-ast.c')
0 files changed, 0 insertions, 0 deletions