From ff0490da93cf29145d4a9b15e2a13712b9580a16 Mon Sep 17 00:00:00 2001 From: richagadgil Date: Thu, 19 Dec 2024 18:23:29 -0600 Subject: [PATCH] change filename --- tools/check_stamped.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/check_stamped.py b/tools/check_stamped.py index 3057cfdbaa0..75168c2db14 100644 --- a/tools/check_stamped.py +++ b/tools/check_stamped.py @@ -128,9 +128,8 @@ def eval(cmd, **kwargs): def get_head(): return eval("git rev-parse --abbrev-ref HEAD") -def get_merge_base(branch): - head = get_head() - return eval(f"git merge-base {branch} {head}") +def get_merge_base(against, branch): + return eval(f"git merge-base {against} {branch}") def get_files_changed(against, ext=('.py')): files = eval( @@ -141,7 +140,7 @@ def get_files_changed(against, ext=('.py')): def main(branch) -> None: unsupported_file_types.extend(specificIgnores) - base = get_merge_base("origin/develop") + base = get_merge_base("origin/develop", branch) fileList = list( get_files_changed(base, ext=supported_file_types))