Fix merge_base_to_upstream()

The parameter was unused.
wentasah · Feb 10, 2025 · c35b0dc · c35b0dc
1 parent 12a9d8d
commit c35b0dc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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