a more reliable version of branching point discovery (#9449)

28d74872 · Stas Bekman · GitHub · 3ec40299 · 28d74872
Unverified Commit 28d74872 authored Jan 07, 2021 by Stas Bekman Committed by GitHub Jan 07, 2021
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

utils/get_modified_files.py utils/get_modified_files.py +1 -1

No files found.
--- 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:])