robossembler/ros2nix
7
0
Fork 0
mirror of https://github.com/wentasah/ros2nix.git synced 2025-06-09 15:52:23 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix merge_base_to_upstream()

Browse source 
The parameter was unused.
This commit is contained in:
Michal Sojka 2025-02-09 19:18:58 +01:00
parent 12a9d8de83
commit c35b0dc7aa
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ros2nix/ros2nix.py
View file

@ -410,7 +410,8 @@ def ros2nix(args):
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