From 9ab2606a54ad7dce5bba31990af2fd238dc2960d Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Wed, 12 Dec 2018 19:25:49 +0100 Subject: Fix `./mach filter_intermittents` in shallow git clones. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `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. --- python/servo/testing_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/servo/testing_commands.py') 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() -- cgit v1.2.3