Skip to content

fix(git): stop native checkout/pull from running against the user's p… #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Spelt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(git): stop native checkout/pull from running against the user's p… #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion internal/adapters/secondary/git/git_native.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ func initSubmodulesNative(dep domain.Dependency) error {
// CheckoutNative switches the dependency repository to the given reference using system git.
func CheckoutNative(dep domain.Dependency, referenceName plumbing.ReferenceName) error {
dirModule := filepath.Join(env.GetModulesDir(), dep.Name())
writeDotGitFile(dep)
defer func() { _ = os.Remove(filepath.Join(dirModule, ".git")) }()
cmd := exec.CommandContext(context.Background(),
"git", "checkout", "-f", referenceName.Short()) // #nosec G204 -- Controlled git checkout command
cmd.Dir = dirModule
Expand All @@ -143,6 +145,8 @@ func CheckoutNative(dep domain.Dependency, referenceName plumbing.ReferenceName)
// PullNative fetches and merges updates using system git.
func PullNative(dep domain.Dependency) error {
dirModule := filepath.Join(env.GetModulesDir(), dep.Name())
writeDotGitFile(dep)
defer func() { _ = os.Remove(filepath.Join(dirModule, ".git")) }()
cmd := exec.CommandContext(context.Background(), "git", "pull", "--force")
cmd.Dir = dirModule
return runCommand(cmd)
Expand All @@ -154,7 +158,11 @@ func runCommand(cmd *exec.Cmd) error {

cmd.Stdout = &stdoutBuf
cmd.Stderr = &stderrBuf
cmd.Env = os.Environ()
// Stop git from discovering an enclosing repository (e.g. the user's own
// project) when a module's .git link file is missing: a bare
// "git checkout"/"git pull" in modules/<dep> would otherwise run against
// the parent work tree and silently switch the user's project branch.
cmd.Env = append(os.Environ(), "GIT_CEILING_DIRECTORIES="+env.GetModulesDir())

if err := cmd.Start(); err != nil {
return fmt.Errorf("failed to start command: %w", err)
Expand Down