From 255d1cb02bc618e06f61b2b02405a2ea41b6bc34 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Thu, 2 Apr 2026 02:59:46 +0700
Subject: [PATCH] Workaround git recursive

---
 src/cook/fetch.rs | 101 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 98 insertions(+), 3 deletions(-)

diff --git a/src/cook/fetch.rs b/src/cook/fetch.rs
index 3bd6e337..c06fd83e 100644
--- a/src/cook/fetch.rs
+++ b/src/cook/fetch.rs
@@ -20,6 +20,7 @@ use crate::wrap_other_err;
 use pkg::SourceIdentifier;
 use pkg::net_backend::DownloadBackendWriter;
 use std::cell::RefCell;
+use std::collections::BTreeMap;
 use std::fs;
 use std::fs::File;
 use std::io::Read;
@@ -209,7 +210,19 @@ pub fn fetch(recipe: &CookRecipe, check_source: bool, logger: &PtyOut) -> Result
                         .arg("--also-filter-submodules");
                 }
                 command.arg(&source_dir_tmp);
-                run_command(command, logger)?;
+                if let Err(e) = run_command(command, logger) {
+                    if !is_redox() {
+                        return Err(e);
+                    }
+                    // TODO: RedoxFS has a race condition problem with `--recursive` and running in multi CPU.
+                    //       It is appear that running the submodule update separately fixes it. Remove this when
+                    //       `git clone https://gitlab.redox-os.org/redox-os/relibc --recursive` proven to work in Redox OS.
+                    let mut cmds = vec!["update", "--init"];
+                    if shallow_clone {
+                        cmds.push("--filter=tree:0");
+                    }
+                    manual_git_recursive_submodule(logger, &source_dir_tmp, cmds)?;
+                }
 
                 // Move source.tmp to source atomically
                 rename(&source_dir_tmp, &source_dir)?;
@@ -309,7 +322,12 @@ pub fn fetch(recipe: &CookRecipe, check_source: bool, logger: &PtyOut) -> Result
                 command.arg("-C").arg(&source_dir);
                 command.arg("submodule").arg("sync").arg("--recursive");
 
-                run_command(command, logger)?;
+                if let Err(e) = run_command(command, logger) {
+                    if !is_redox() {
+                        return Err(e);
+                    }
+                    manual_git_recursive_submodule(logger, &source_dir, vec!["sync"])?;
+                }
 
                 // Update submodules
                 let mut command = Command::new("git");
@@ -322,7 +340,16 @@ pub fn fetch(recipe: &CookRecipe, check_source: bool, logger: &PtyOut) -> Result
                 if shallow_clone {
                     command.arg("--filter=tree:0");
                 }
-                run_command(command, logger)?;
+                if let Err(e) = run_command(command, logger) {
+                    if !is_redox() {
+                        return Err(e);
+                    }
+                    let mut cmds = vec!["update", "--init"];
+                    if shallow_clone {
+                        cmds.push("--filter=tree:0");
+                    }
+                    manual_git_recursive_submodule(logger, &source_dir, cmds)?;
+                }
 
                 fetch_apply_patches(recipe_dir, patches, script, &source_dir, logger)?;
             }
@@ -428,6 +455,74 @@ pub fn fetch(recipe: &CookRecipe, check_source: bool, logger: &PtyOut) -> Result
     Ok(result)
 }
 
+fn manual_git_recursive_submodule(
+    logger: &PtyOut,
+    source_dir: &PathBuf,
+    cmd: Vec<&str>,
+) -> Result<()> {
+    log_to_pty!(
+        logger,
+        "Git submodule {} failed, might be caused by race condition in RedoxFS, retrying without --recursive.",
+        cmd[0]
+    );
+
+    let mut repo_registry: BTreeMap<PathBuf, bool> = BTreeMap::new();
+
+    loop {
+        let mut dirty_git = false;
+
+        let output = Command::new("find")
+            .args(&[".", "-name", ".git"])
+            .current_dir(&source_dir)
+            .output()
+            .map_err(wrap_io_err!("Failed to execute find"))?;
+
+        let stdout = String::from_utf8_lossy(&output.stdout);
+
+        for line in stdout.lines() {
+            let git_path = PathBuf::from(line);
+            if let Some(repo_root) = git_path.parent() {
+                let repo_root_buf = repo_root.to_path_buf();
+
+                if !repo_registry.contains_key(&repo_root_buf) {
+                    repo_registry.insert(repo_root_buf.clone(), false);
+                    dirty_git = true;
+                }
+            }
+        }
+
+        if !dirty_git {
+            // completed
+            return Ok(());
+        }
+
+        let pending_repos: Vec<PathBuf> = repo_registry
+            .iter()
+            .filter(|&(_, &synced)| !synced)
+            .map(|(path, _)| path.clone())
+            .collect();
+
+        if pending_repos.is_empty() {
+            bail_other_err!("No pending repos but dirty");
+        }
+
+        for repo in pending_repos {
+            println!("==> Processing: {:?}", repo);
+
+            let mut command = Command::new("git");
+            command.arg("-C").arg(&repo).current_dir(&source_dir);
+            command.arg("submodule");
+
+            for cmd in &cmd {
+                command.arg(cmd);
+            }
+            run_command(command, logger)?;
+
+            repo_registry.insert(repo, true);
+        }
+    }
+}
+
 /// This does the same check as in cook_build
 fn fetch_will_build(recipe: &CookRecipe) -> bool {
     let check_source = !recipe.is_deps;