From 28d74872cc049e0cbee3fafd15cbbabfe348ebd4 Mon Sep 17 00:00:00 2001 From: Stas Bekman Date: Thu, 7 Jan 2021 01:47:50 -0800 Subject: [PATCH] a more reliable version of branching point discovery (#9449) --- utils/get_modified_files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/get_modified_files.py b/utils/get_modified_files.py index 78d2ec128b..c3d9327549 100644 --- a/utils/get_modified_files.py +++ b/utils/get_modified_files.py @@ -24,7 +24,7 @@ import subprocess import sys -fork_point_sha = subprocess.check_output("git merge-base --fork-point master".split()).decode("utf-8") +fork_point_sha = subprocess.check_output("git merge-base master HEAD".split()).decode("utf-8") modified_files = subprocess.check_output(f"git diff --name-only {fork_point_sha}".split()).decode("utf-8").split() joined_dirs = "|".join(sys.argv[1:])