From 6335124e3e43e0fb08a83b372029f184908ec7f3 Mon Sep 17 00:00:00 2001
From: Antonio Paolillo <apaolill@gmail.com>
Date: Tue, 10 Mar 2026 13:12:29 +0100
Subject: [PATCH] Fix shallow clone for tag/branch

Shallow clones (`--depth 1`) only fetch HEAD of the default branch, so
a subsequent `git checkout <tag>` fails with "pathspec did not match".

Use `git clone --depth 1 --branch <ref>` instead, which fetches the
target ref directly in a single step; no separate checkout is needed.

Also refactor project_git_clone to build each git command (clone,
checkout, submodules) independently, then dispatch once on
single_run_command. This removes the nested shallow x single_run
branching and gracefully handles an empty commit (clone HEAD only).

Signed-off-by: Antonio Paolillo <apaolill@gmail.com>
---
 src/pythainer/builders/utils.py | 38 ++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/pythainer/builders/utils.py b/src/pythainer/builders/utils.py
index 3d84a7c..794d1e7 100644
--- a/src/pythainer/builders/utils.py
+++ b/src/pythainer/builders/utils.py
@@ -117,26 +117,34 @@ def project_git_clone(
     target_dirname_suffix = f" {target_dirname.strip()}" if target_dirname else ""
     depth_flag = " --depth 1" if shallow else ""
 
-    if single_run_command:
-        commands = [
-            f"cd {workdir}",
-            f"git clone{depth_flag} {git_url}{target_dirname_suffix}",
-            f"cd {repo_name}",
-            f"git checkout {commit}",
-        ] + (
-            [f"git submodule update --init --recursive{depth_flag}"]
-            if submodule_init_recursive
-            else []
-        )
+    # 1. Clone
+    branch_flag = f" --branch {commit}" if (shallow and commit) else ""
+    clone_cmd = f"git clone{depth_flag}{branch_flag} {git_url}{target_dirname_suffix}"
+
+    # 2. Checkout (only needed for full clones with a specific commit)
+    checkout_cmd = f"git checkout {commit}" if (not shallow and commit) else None
 
+    # 3. Submodules
+    if submodule_init_recursive:
+        submodule_cmd = f"git submodule update --init --recursive{depth_flag}"
+    else:
+        submodule_cmd = None
+
+    if single_run_command:
+        commands = [f"cd {workdir}", clone_cmd, f"cd {repo_name}"]
+        if checkout_cmd:
+            commands.append(checkout_cmd)
+        if submodule_cmd:
+            commands.append(submodule_cmd)
         builder.run_multiple(commands=commands)
     else:
         builder.workdir(path=workdir)
-        builder.run(command=f"git clone{depth_flag} {git_url}{target_dirname_suffix}")
+        builder.run(command=clone_cmd)
         builder.workdir(path=repo_name)
-        builder.run(command=f"git checkout {commit}")
-        if submodule_init_recursive:
-            builder.run(command=f"git submodule update --init --recursive{depth_flag}")
+        if checkout_cmd:
+            builder.run(command=checkout_cmd)
+        if submodule_cmd:
+            builder.run(command=submodule_cmd)
 
     return target_dirname if target_dirname_suffix else repo_name