Skip to content

Conversation

@0xvv
Copy link
Contributor

@0xvv 0xvv commented Jan 16, 2025

Motivation

Fixes #3962

Solution

Force initialization of a git repo at the root of the foundry folder unless there already is one or the flag --use-parent-git is present and there is indeed a parent git repo.

The --use-parent-git flag replicates the current behavior in case some people prefer it.

Tested the reproductions steps of the issue after to be sure.
The fix in forge init leads to the expected behavior for forge install

@0xvv 0xvv force-pushed the fix-git-submodules branch 2 times, most recently from 4f7dba2 to 739b81a Compare January 17, 2025 00:17
@0xvv 0xvv force-pushed the fix-git-submodules branch from 739b81a to 19cd229 Compare January 17, 2025 00:32
@0xvv 0xvv marked this pull request as ready for review January 17, 2025 00:34
@grandizzy
Copy link
Collaborator

I am not sure I like the way git submodules is desired to be used in #3962 (could become beefy and hard to maintain) but rather have different projects / deps with their own foundry.toml file and submodules. @zerosnacks @yash-atreya wdyt?

@grandizzy grandizzy added T-bug Type: bug C-forge Command: forge labels Jan 23, 2025
@zerosnacks
Copy link
Member

I'm supportive of this change, I too would expect that when I run forge install in a subdirectory it should create a .gitmodules there rather than at the top level.

Only suggestion I would have is changing the flag name to --in-root to as parent does not apply when you have second level nesting of directories

cc @yash-atreya do you see any issues on how this may interfere with your recent PRs?

@jenpaff jenpaff added this to the v1.1.0 milestone Mar 25, 2025
@jenpaff jenpaff moved this to Ready For Review in Foundry Mar 25, 2025
@jenpaff jenpaff assigned 0xvv and unassigned yash-atreya Apr 9, 2025
@jenpaff
Copy link
Contributor

jenpaff commented Apr 9, 2025

@0xvv bump on the previous comment, please flag if you're stuck or need any support from us.

@jenpaff jenpaff modified the milestones: v1.1.0, v1.2.0 Apr 15, 2025
@jenpaff jenpaff modified the milestones: v1.2.0, v1.3.0 May 5, 2025
@grandizzy grandizzy modified the milestones: v1.3.0, v1.4.0 Jul 15, 2025
@DaniPopes
Copy link
Member

This is orthogonal #3962 but LGTM

@DaniPopes DaniPopes requested a review from yash-atreya August 12, 2025 10:30
@DaniPopes DaniPopes enabled auto-merge (squash) August 12, 2025 10:30
Copy link
Contributor

@yash-atreya yash-atreya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@DaniPopes DaniPopes merged commit c802f29 into foundry-rs:master Aug 12, 2025
22 checks passed
@github-project-automation github-project-automation bot moved this from Ready For Review to Done in Foundry Aug 12, 2025
MerkleBoy pushed a commit to MerkleBoy/foundry that referenced this pull request Sep 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C-forge Command: forge T-bug Type: bug

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

forge install modifies top-level .gitmodules in existing project repo instead of where foundry.toml lives

6 participants