Skip to content

🔒 [security] Propagate file cleanup errors during git fallback #84

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

Merged
bashandbone merged 2 commits into from
Aug 11, 2026
Merged

🔒 [security] Propagate file cleanup errors during git fallback #84

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9182376
🔒 [security] Propagate file cleanup errors during git fallback
google-labs-jules[bot] Aug 11, 2026
8d2f057
Merge branch 'main' into jules-7354833371978033167-e73f2ed8
bashandbone Aug 11, 2026
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
12 changes: 8 additions & 4 deletions src/git_ops/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@ impl GitOperations for GitOpsManager {
// Clean up potentially partially initialized submodule path before fallback
let sub_path = workdir.join(&opts.path);
if sub_path.exists() {
let _ = std::fs::remove_dir_all(&sub_path);
std::fs::remove_dir_all(&sub_path)
.context("Failed to clean up partially initialized submodule path before CLI fallback")?;
}

// git2 also adds the submodule to .gitmodules, which will cause CLI to fail
Expand All @@ -415,7 +416,8 @@ impl GitOperations for GitOpsManager {
new_content.push('\n');
}
}
let _ = std::fs::write(&gitmodules_path, new_content);
std::fs::write(&gitmodules_path, new_content)
.context("Failed to rewrite .gitmodules during fallback cleanup")?;
}
}

Expand Down Expand Up @@ -448,15 +450,17 @@ impl GitOperations for GitOpsManager {
// Also git2 might have created the internal git directory
let internal_git_dir = workdir.join(".git").join("modules").join(&opts.name);
if internal_git_dir.exists() {
let _ = std::fs::remove_dir_all(&internal_git_dir);
std::fs::remove_dir_all(&internal_git_dir)
.context("Failed to clean up partially initialized internal git directory before CLI fallback")?;
}

// git2's repo.submodule() uses the *path* (not the name) as the key for the
// internal modules directory, so ".git/modules/lib/reinit" may exist even when
// ".git/modules/<name>" has already been cleaned up. Remove both.
let path_internal_git_dir = workdir.join(".git").join("modules").join(&opts.path);
if path_internal_git_dir.exists() {
let _ = std::fs::remove_dir_all(&path_internal_git_dir);
std::fs::remove_dir_all(&path_internal_git_dir)
.context("Failed to clean up partially initialized internal git directory (by path) before CLI fallback")?;
}

// And removed from index
Expand Down
Loading