diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-12-12 19:25:49 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-12-12 20:02:44 +0100 |
| commit | 9ab2606a54ad7dce5bba31990af2fd238dc2960d (patch) | |
| tree | 6d6e0429a14ef6cca163136e2e8c282a382cb18b /python/servo/testing_commands.py | |
| parent | e680c5be803d2157b7d25646b8623f3d8bde7723 (diff) | |
| download | servo-9ab2606a54ad7dce5bba31990af2fd238dc2960d.tar.gz servo-9ab2606a54ad7dce5bba31990af2fd238dc2960d.zip | |
Fix `./mach filter_intermittents` in shallow git clones.
`git log --merges` only shows commits with at least two parents.
Presumably, this only works when the parent commits are in the local repository.
In a shallow clone (`--depth 1`), on the HEAD commit is fetched.
This commit removes the `--merges` filter.
This shouldn’t affect the behavior,
since CI always runs with a merge commit as HEAD.
Diffstat (limited to 'python/servo/testing_commands.py')
| -rw-r--r-- | python/servo/testing_commands.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 90bded199a6..c1f2ef0c65a 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -543,7 +543,7 @@ class MachCommands(CommandBase): reported = set() proc = subprocess.Popen( - ["git", "log", "--merges", "--oneline", "-1"], + ["git", "log", "--oneline", "-1"], stdout=subprocess.PIPE) (last_merge, _) = proc.communicate() |