From 667790e103072702bf075c5f071fc20cd472cb1a Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Tue, 14 Oct 2025 15:13:04 -0400
Subject: [PATCH] xtask: avoid `git submodule update` when possible

`git submodule update` fails when running in a codex sandbox:

```
  error: could not lock config file /Users/tamird/src/aya/.git/modules/libbpf/config: Operation not permitted
```

so just avoid it when not necessary.
---
 xtask/src/main.rs | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index b085cc12..99c48c0e 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -3,9 +3,9 @@ mod docs;
 mod public_api;
 mod run;
 
-use std::process::Command;
+use std::process::{Command, Output};
 
-use anyhow::{Context as _, Result};
+use anyhow::{Context as _, Result, bail};
 use cargo_metadata::{Metadata, MetadataCommand};
 use clap::Parser;
 use xtask::{LIBBPF_DIR, exec};
@@ -33,12 +33,29 @@ fn main() -> Result<()> {
         .context("failed to run cargo metadata")?;
     let Metadata { workspace_root, .. } = &metadata;
 
-    // Initialize the submodules.
-    exec(Command::new("git").arg("-C").arg(workspace_root).args([
-        "submodule",
-        "update",
-        "--init",
-    ]))?;
+    let mut libbpf_submodule_status = Command::new("git");
+    let output = libbpf_submodule_status
+        .arg("-C")
+        .arg(workspace_root)
+        .arg("submodule")
+        .arg("status")
+        .arg(LIBBPF_DIR)
+        .output()
+        .with_context(|| format!("failed to run {libbpf_submodule_status:?}"))?;
+    let Output { status, .. } = &output;
+    if !status.success() {
+        bail!("{libbpf_submodule_status:?} failed: {output:?}")
+    }
+    let Output { stdout, .. } = output;
+    if !stdout.starts_with(b" ") {
+        // Initialize the submodules.
+        exec(Command::new("git").arg("-C").arg(workspace_root).args([
+            "submodule",
+            "update",
+            "--init",
+        ]))?;
+    }
+
     let libbpf_dir = workspace_root.join(LIBBPF_DIR);
     let libbpf_dir = libbpf_dir.as_std_path();