lint: Fix COMMIT_RANGE issues

1 files changed, 5 insertions, 18 deletions

diff --git a/test/lint/lint-git-commit-check.py b/test/lint/lint-git-commit-check.py
index 5897a17e70..5dc30cc755 100755
--- a/test/lint/lint-git-commit-check.py
+++ b/test/lint/lint-git-commit-check.py
@@ -23,31 +23,18 @@ def parse_args():
         """,
         epilog=f"""
             You can manually set the commit-range with the COMMIT_RANGE
-            environment variable (e.g. "COMMIT_RANGE='47ba2c3...ee50c9e'
-            {sys.argv[0]}"). Defaults to current merge base when neither
-            prev-commits nor the environment variable is set.
+            environment variable (e.g. "COMMIT_RANGE='HEAD~n..HEAD'
+            {sys.argv[0]}") for the last 'n' commits.
         """)
-
-    parser.add_argument("--prev-commits", "-p", required=False, help="The previous n commits to check")
-
     return parser.parse_args()
 
 
 def main():
-    args = parse_args()
+    parse_args()
     exit_code = 0
 
-    if not os.getenv("COMMIT_RANGE"):
-        if args.prev_commits:
-            commit_range = "HEAD~" + args.prev_commits + "...HEAD"
-        else:
-            # This assumes that the target branch of the pull request will be master.
-            merge_base = check_output(["git", "merge-base", "HEAD", "master"], text=True, encoding="utf8").rstrip("\n")
-            commit_range = merge_base + "..HEAD"
-    else:
-        commit_range = os.getenv("COMMIT_RANGE")
-        if commit_range == "SKIP_EMPTY_NOT_A_PR":
-            sys.exit(0)
+    assert os.getenv("COMMIT_RANGE")  # E.g. COMMIT_RANGE='HEAD~n..HEAD'
+    commit_range = os.getenv("COMMIT_RANGE")
 
     commit_hashes = check_output(["git", "log", commit_range, "--format=%H"], text=True, encoding="utf8").splitlines()