From c35b0dc7aad90b9611dccc2d5a7d2e992b7b0340 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 9 Feb 2025 19:18:58 +0100 Subject: [PATCH] Fix merge_base_to_upstream() The parameter was unused. --- ros2nix/ros2nix.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ros2nix/ros2nix.py b/ros2nix/ros2nix.py index 5224254..8bf2190 100755 --- a/ros2nix/ros2nix.py +++ b/ros2nix/ros2nix.py @@ -410,7 +410,8 @@ def check_output(cmd: List[str]): head = check_output("git rev-parse HEAD".split()) def merge_base_to_upstream(commit: str) -> str: - return subprocess.check_output(f"git merge-base {head} $(git for-each-ref refs/remotes/origin --format='%(objectname)')", cwd=srcdir,shell=True).decode().strip() + return subprocess.check_output(f"git merge-base {commit} $(git for-each-ref refs/remotes/origin --format='%(objectname)')", + cwd=srcdir, shell=True).decode().strip() if args.use_per_package_src: # we need to get merge_base again to filter out applied patches from the package git hash