← Back to issue list

wstool: don't rely on host git

View original Github issue

Metadata

Project
snapcraft
Number
#2852
Type
pull request
State
merged
Author
kyrofa
Labels
Created
Updated
Closed

Current evaluation

Merged a fix ensuring wstool uses its bundled git instead of relying on host git. This enables rosinstall file merging without host git installed. Approved by one reviewer with passing CI checks.

Suggested action:

No scores available.

Issue body

- [x] Have you followed the [guidelines for contributing](https://github.com/snapcore/snapcraft/blob/master/CONTRIBUTING.md)? - [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [x] Have you successfully run `./runtests.sh static`? - [x] Have you successfully run `./runtests.sh tests/unit`? ----- The Catkin plugin utilizes wstool to support rosinstall files. While wstool is fetched into its own install area so as to not contaminate either the host or the snap, it doesn't properly use the git that is fetched along with it. This means that merging rosinstall files that include git repositories only works if git is already installed on the host. If the host doesn't include git, it errors out. This PR properly sets the variables necessary to run git from wstool's install area, thereby no longer relying on the host already having git installed.

Evaluation history

Date Model Scores Action Summary
qwen/qwen3.6-35b-a3b Merged a fix ensuring wstool uses its bundled git instead of relying on host git. This enables rosinstall file merging without host git installed. Approved by one reviewer with passing CI checks.
qwen3.6-35b-a3b-mtp-q6 Merged changes to configure wstool to use its bundled git binary instead of the host system. This resolves build failures when processing rosinstall files on environments without a preinstalled git.
qwen3.6-35b-a3b-mtp-q6 Merged fix ensuring wstool uses its bundled git instead of the host system. This resolves rosinstall merge failures when git is not installed on the host.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#1927 catkin plugin: extract Wstool into its own module snapcraft merged Merged after resolving conflicts. Extracts Wstool from the catkin plugin into a standalone module to support recursive rosinstall file parsing. Approved by two reviewers with passing CI checks.
72%